Reviewers: Toon Verwaest,
Description:
Version 3.28.71.12 (merged r24125)
Fix escaped index JSON parsing
BUG=416449
LOG=N
[email protected]
Please review this at https://codereview.chromium.org/597893002/
SVN Base: https://v8.googlecode.com/svn/branches/3.28
Affected files (+4, -6 lines):
M src/json-parser.h
M src/version.cc
A + test/mjsunit/regress/regress-json-parse-index.js
Index: src/json-parser.h
diff --git a/src/json-parser.h b/src/json-parser.h
index
c23e50dbb4dbd0eefbfc955f54eaed03e9b34511..cf3e6b82b17092e2b03945035ed650b64cf8a4b9
100644
--- a/src/json-parser.h
+++ b/src/json-parser.h
@@ -424,8 +424,7 @@ Handle<Object> JsonParser<seq_ascii>::ParseJsonObject()
{
if (value.is_null()) return ReportUnexpectedCharacter();
}
- JSObject::SetOwnPropertyIgnoreAttributes(
- json_object, key, value, NONE).Assert();
+ Runtime::DefineObjectProperty(json_object, key, value, NONE).Check();
} while (MatchSkipWhiteSpace(','));
if (c0_ != '}') {
return ReportUnexpectedCharacter();
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
16eefdbf81806de422adda940c9f30e8f4f51c06..3080460cfc7e78444b215fb04d6e2d02caddd947
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 28
#define BUILD_NUMBER 71
-#define PATCH_LEVEL 11
+#define PATCH_LEVEL 12
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
Index: test/mjsunit/regress/regress-json-parse-index.js
diff --git a/test/mjsunit/regress/regress-349870.js
b/test/mjsunit/regress/regress-json-parse-index.js
similarity index 72%
copy from test/mjsunit/regress/regress-349870.js
copy to test/mjsunit/regress/regress-json-parse-index.js
index
72df05524bf1ccbcc8e4201512238e6f99e3fdea..d1a785aaf1ef35714d5702be15cff74bfaa73521
100644
--- a/test/mjsunit/regress/regress-349870.js
+++ b/test/mjsunit/regress/regress-json-parse-index.js
@@ -2,6 +2,5 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-var r = /x/;
-Object.freeze(r);
-r.compile("x");
+var o = JSON.parse('{"\\u0030":100}');
+assertEquals(100, o[0]);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
