AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix issues with JSON stringify replacer array

Browse Source 
If the replacer array contains a property key we should include the
property even if the property is non enumerable or if it is a non own
property.

String and Number wrappers in the replacer array should be treated as
string and number values.

R=yangguo@chromium.org
BUG=v8:3200, v8:3201
LOG=Y

Review URL: https://codereview.chromium.org/187053003

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@19685 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
yangguo@chromium.org 2014-03-06 09:50:53 +00:00
parent 7bf33c53eb
commit e2e2f4050d
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/json.js
View File

@ -213,14 +213,21 @@ function JSONStringify(value, replacer, space) {
if (IS_ARRAY(replacer)) { if (IS_ARRAY(replacer)) {
// Deduplicate replacer array items. // Deduplicate replacer array items.
var property_list = new InternalArray(); var property_list = new InternalArray();
var seen_properties = {}; var seen_properties = { __proto__: null };
var seen_sentinel = {};
var length = replacer.length; var length = replacer.length;
for (var i = 0; i < length; i++) { for (var i = 0; i < length; i++) {
var item = replacer[i]; var item = replacer[i];
if (IS_NUMBER(item)) item = %_NumberToString(item); if (IS_STRING_WRAPPER(item)) {
if (IS_STRING(item) && !(item in seen_properties)) { item = ToString(item);
} else {
if (IS_NUMBER_WRAPPER(item)) item = ToNumber(item);
if (IS_NUMBER(item)) item = %_NumberToString(item);
}
if (IS_STRING(item) && seen_properties[item] != seen_sentinel) {
property_list.push(item); property_list.push(item);
seen_properties[item] = true; // We cannot use true here because __proto__ needs to be an object.
seen_properties[item] = seen_sentinel;
} }
} }
replacer = property_list; replacer = property_list;

24
test/mjsunit/regress/regress-3135.js
View File

@ -19,10 +19,21 @@ assertEquals('{"y":4,"x":3}', JSON.stringify({ x : 3, y : 4}, ["y", "x"]));
assertEquals('{"y":4,"1":2,"x":3}', assertEquals('{"y":4,"1":2,"x":3}',
JSON.stringify({ x : 3, y : 4, 1 : 2 }, ["y", 1, "x"])); JSON.stringify({ x : 3, y : 4, 1 : 2 }, ["y", 1, "x"]));
// __proto__ is ignored and doesn't break anything. // With a replacer array the value of the property is retrieved using [[Get]]
// ignoring own and enumerability.
var a = { x : 8 }; var a = { x : 8 };
assertEquals('{"__proto__":{"__proto__":null},"x":8}',
JSON.stringify(a, ["__proto__", "x", "__proto__"]));
a.__proto__ = { x : 7 }; a.__proto__ = { x : 7 };
assertEquals('{"x":8}', JSON.stringify(a, ["__proto__", "x", "__proto__"])); assertEquals('{"__proto__":{"__proto__":{"__proto__":null},"x":7},"x":8}',
JSON.stringify(a, ["__proto__", "x"]));
var b = { __proto__: { x: 9 } };
assertEquals('{}', JSON.stringify(b));
assertEquals('{"x":9}', JSON.stringify(b, ["x"]));
var c = {x: 10};
Object.defineProperty(c, 'x', { enumerable: false });
assertEquals('{}', JSON.stringify(c));
assertEquals('{"x":10}', JSON.stringify(c, ["x"]));
// Arrays are not affected by the replacer array. // Arrays are not affected by the replacer array.
assertEquals("[9,8,7]", JSON.stringify([9, 8, 7], [1, 1])); assertEquals("[9,8,7]", JSON.stringify([9, 8, 7], [1, 1]));
@ -51,3 +62,12 @@ assertEquals('{}',
assertEquals('{}', assertEquals('{}',
JSON.stringify({ x : 1, "1": 1 }, JSON.stringify({ x : 1, "1": 1 },
[{ valueOf: function() { return 1;} }])); [{ valueOf: function() { return 1;} }]));
// Make sure that property names that clash with the names of Object.prototype
// still works.
assertEquals('{"toString":42}', JSON.stringify({ toString: 42 }, ["toString"]));
// Number wrappers and String wrappers should be unwrapped.
assertEquals('{"1":1,"s":"s"}',
JSON.stringify({ 1: 1, s: "s" },
[new Number(1), new String("s")]));