Revision: 24165
Author: [email protected]
Date: Wed Sep 24 07:53:04 2014 UTC
Log: Version 3.27.34.21 (merged r24125)
Fix escaped index JSON parsing
BUG=416449
LOG=N
[email protected], [email protected]
Review URL: https://codereview.chromium.org/600733003
https://code.google.com/p/v8/source/detail?r=24165
Added:
/branches/3.27/test/mjsunit/regress/regress-json-parse-index.js
Modified:
/branches/3.27/src/json-parser.h
/branches/3.27/src/objects.cc
/branches/3.27/src/version.cc
=======================================
--- /dev/null
+++ /branches/3.27/test/mjsunit/regress/regress-json-parse-index.js Wed Sep
24 07:53:04 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.27/src/json-parser.h Wed Jun 11 00:05:05 2014 UTC
+++ /branches/3.27/src/json-parser.h Wed Sep 24 07:53:04 2014 UTC
@@ -426,8 +426,7 @@
if (value.is_null()) return ReportUnexpectedCharacter();
}
- JSObject::SetOwnPropertyIgnoreAttributes(
- json_object, key, value, NONE).Assert();
+ Runtime::ForceSetObjectProperty(json_object, key, value,
NONE).Check();
} while (MatchSkipWhiteSpace(','));
if (c0_ != '}') {
return ReportUnexpectedCharacter();
=======================================
--- /branches/3.27/src/objects.cc Thu Sep 18 12:31:55 2014 UTC
+++ /branches/3.27/src/objects.cc Wed Sep 24 07:53:04 2014 UTC
@@ -699,7 +699,7 @@
Handle<Name> name,
Handle<Object> value,
PropertyDetails details) {
- ASSERT(!object->HasFastProperties());
+ CHECK(!object->HasFastProperties());
Handle<NameDictionary>
property_dictionary(object->property_dictionary());
if (!name->IsUniqueName()) {
=======================================
--- /branches/3.27/src/version.cc Thu Sep 18 12:31:55 2014 UTC
+++ /branches/3.27/src/version.cc Wed Sep 24 07:53:04 2014 UTC
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 27
#define BUILD_NUMBER 34
-#define PATCH_LEVEL 20
+#define PATCH_LEVEL 21
// 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.