Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ function makeSafe (method, name) {
if (name !== undefined) {
return getErrorMessage(error, name)
}
return `"${getErrorMessage(error, name)}"`
return strEscape(getErrorMessage(error, name))
}
}
Object.defineProperty(safeMethod, 'name', { value: `safe_${method.name}` })
Expand Down
20 changes: 20 additions & 0 deletions test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1972,3 +1972,23 @@ test('safe mode safeguards against failing toJSON and a difficult to stringify e

assert.end()
})

test('safe mode escapes error messages from throwing getters', (assert) => {
const serializer = stringify.configure({ safe: true })
for (const message of ['Missing "token"', 'line\nbreak', 'path\\file', '\u0000', '\ud800']) {
const input = { get token () { throw new Error(message) } }
const expected = `Error: Stringification failed (${message})`
const results = [
serializer(input),
serializer(input, null, 2),
serializer(input, ['token'])
]
for (const result of results) {
assert.equal(result, JSON.stringify(expected))
assert.equal(JSON.parse(/** @type {string} */ (result)), expected)
}
const replaced = serializer(input, (key, value) => value)
assert.same(JSON.parse(/** @type {string} */ (replaced)), { token: expected })
}
assert.end()
})