commit 2060cd6150cdcd41d72640273a8ded546e97ca9d
author yangguo@chromium.org <yangguo@chromium.org> Wed Sep 24 07:33:46 2014 +0000
committer yangguo@chromium.org <yangguo@chromium.org> Wed Sep 24 07:33:46 2014 +0000
tree 86a52ff21e69a8f0e126ab42d30c58e9c8bcf185
parent c0f76a15bbfb6badefa8f21f539cb43a7388f6cd

Version 3.28.71.12 (merged r24125)

Fix escaped index JSON parsing

BUG=416449
LOG=N
R=verwaest@google.com, verwaest@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/3.28@24162 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/json-parser.h

diff --git a/src/json-parser.h b/src/json-parser.h
index c23e50d..cf3e6b8 100644
--- a/src/json-parser.h
+++ b/src/json-parser.h
@@ -424,8 +424,7 @@
         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();

src/objects.cc

diff --git a/src/objects.cc b/src/objects.cc
index 75b5860..a994718 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -693,7 +693,7 @@
                                      Handle<Name> name,
                                      Handle<Object> value,
                                      PropertyDetails details) {
-  DCHECK(!object->HasFastProperties());
+  CHECK(!object->HasFastProperties());
   Handle<NameDictionary> property_dictionary(object->property_dictionary());
 
   if (!name->IsUniqueName()) {

src/version.cc

diff --git a/src/version.cc b/src/version.cc
index 16eefdb..3080460 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

test/mjsunit/regress/regress-json-parse-index.js

diff --git a/test/mjsunit/regress/regress-json-parse-index.js b/test/mjsunit/regress/regress-json-parse-index.js
new file mode 100644
index 0000000..d1a785a
--- /dev/null
+++ b/test/mjsunit/regress/regress-json-parse-index.js
@@ -0,0 +1,6 @@
+// Copyright 2014 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+var o = JSON.parse('{"\\u0030":100}');
+assertEquals(100, o[0]);