Reviewers: Michael Starzinger,
Message:
Thanks for the review. I've updated the corresponding check in the
handlified
JSObject::SetElement too.
https://codereview.chromium.org/17167002/diff/1/src/runtime.cc
File src/runtime.cc (right):
https://codereview.chromium.org/17167002/diff/1/src/runtime.cc#newcode4757
src/runtime.cc:4757: if (!value->IsSmi() && !value->IsHeapNumber() &&
!value->IsUndefined()) {
On 2013/06/17 11:30:29, Michael Starzinger wrote:
nit: Better use "!value->IsNumber() && !value->IsUndefined()" here.
Done.
https://codereview.chromium.org/17167002/diff/1/src/runtime.cc#newcode4777
src/runtime.cc:4777: !value->IsHeapNumber() &&
On 2013/06/17 11:30:29, Michael Starzinger wrote:
nit: Likewise.
Done.
Description:
Fix Runtime_SetProperty to properly handle OOM failures
BUG=chromium:249873
Please review this at https://codereview.chromium.org/17167002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/objects.cc
M src/runtime.cc
Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index
6b605e5841ebff66b737c36a11bac03b631a183e..86c8b38bd90415d08c7e2833e6fdabba9140dadd
100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -12057,7 +12057,7 @@ Handle<Object>
JSObject::SetElement(Handle<JSObject> object,
StrictModeFlag strict_mode,
SetPropertyMode set_mode) {
if (object->HasExternalArrayElements()) {
- if (!value->IsSmi() && !value->IsHeapNumber()
&& !value->IsUndefined()) {
+ if (!value->IsNumber() && !value->IsUndefined()) {
bool has_exception;
Handle<Object> number = Execution::ToNumber(value, &has_exception);
if (has_exception) return Handle<Object>();
Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index
9211b56653f2bce095fe90262d2ad86252df3c34..6112035b05dc78d5cb9fc48960dc9e125032f23b
100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -4753,25 +4753,40 @@ MaybeObject* Runtime::SetObjectProperty(Isolate*
isolate,
}
js_object->ValidateElements();
- Handle<Object> result = JSObject::SetElement(
- js_object, index, value, attr, strict_mode, set_mode);
+ if (js_object->HasExternalArrayElements()) {
+ if (!value->IsNumber() && !value->IsUndefined()) {
+ bool has_exception;
+ Handle<Object> number = Execution::ToNumber(value, &has_exception);
+ if (has_exception) return Failure::Exception();
+ value = number;
+ }
+ }
+ MaybeObject* result = js_object->SetElement(
+ index, *value, attr, strict_mode, true, set_mode);
js_object->ValidateElements();
- if (result.is_null()) return Failure::Exception();
+ if (result->IsFailure()) return result;
return *value;
}
if (key->IsName()) {
- Handle<Object> result;
+ MaybeObject* result;
Handle<Name> name = Handle<Name>::cast(key);
if (name->AsArrayIndex(&index)) {
- result = JSObject::SetElement(
- js_object, index, value, attr, strict_mode, set_mode);
+ if (js_object->HasExternalArrayElements()) {
+ if (!value->IsNumber() && !value->IsUndefined()) {
+ bool has_exception;
+ Handle<Object> number = Execution::ToNumber(value,
&has_exception);
+ if (has_exception) return Failure::Exception();
+ value = number;
+ }
+ }
+ result = js_object->SetElement(
+ index, *value, attr, strict_mode, true, set_mode);
} else {
if (name->IsString()) Handle<String>::cast(name)->TryFlatten();
- result = JSReceiver::SetProperty(
- js_object, name, value, attr, strict_mode);
+ result = js_object->SetProperty(*name, *value, attr, strict_mode);
}
- if (result.is_null()) return Failure::Exception();
+ if (result->IsFailure()) return result;
return *value;
}
--
--
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/groups/opt_out.
