Revision: 24162
Author:   [email protected]
Date:     Wed Sep 24 07:33:46 2014 UTC
Log:      Version 3.28.71.12 (merged r24125)

Fix escaped index JSON parsing

BUG=416449
LOG=N
[email protected], [email protected]

Review URL: https://codereview.chromium.org/597893002
https://code.google.com/p/v8/source/detail?r=24162

Added:
 /branches/3.28/test/mjsunit/regress/regress-json-parse-index.js
Modified:
 /branches/3.28/src/json-parser.h
 /branches/3.28/src/objects.cc
 /branches/3.28/src/version.cc

=======================================
--- /dev/null
+++ /branches/3.28/test/mjsunit/regress/regress-json-parse-index.js Wed Sep 24 07:33:46 2014 UTC
@@ -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]);
=======================================
--- /branches/3.28/src/json-parser.h    Wed Aug  6 00:06:29 2014 UTC
+++ /branches/3.28/src/json-parser.h    Wed Sep 24 07:33:46 2014 UTC
@@ -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();
=======================================
--- /branches/3.28/src/objects.cc       Thu Sep 18 12:11:48 2014 UTC
+++ /branches/3.28/src/objects.cc       Wed Sep 24 07:33:46 2014 UTC
@@ -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()) {
=======================================
--- /branches/3.28/src/version.cc       Tue Sep 23 07:45:52 2014 UTC
+++ /branches/3.28/src/version.cc       Wed Sep 24 07:33:46 2014 UTC
@@ -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

--
--
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.

Reply via email to