Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(293)

Unified Diff: content/renderer/v8_value_converter_impl.cc

Issue 10837066: Fixing crash in V8ValueConverter. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Getters again Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/v8_value_converter_impl.cc
diff --git a/content/renderer/v8_value_converter_impl.cc b/content/renderer/v8_value_converter_impl.cc
index dc76394da5c61202cc90a57952109143538ea8ec..8c62897bc94f3e64efbdc8f7ccd7ecac33b2bb74 100644
--- a/content/renderer/v8_value_converter_impl.cc
+++ b/content/renderer/v8_value_converter_impl.cc
@@ -311,7 +311,18 @@ Value* V8ValueConverterImpl::FromV8Object(
for (uint32 i = 0; i < property_names->Length(); ++i) {
v8::Handle<v8::Value> key(property_names->Get(i));
- if (!key->IsString() || !val->HasRealNamedProperty(key->ToString()))
+ // base::DictionaryValue can only have string properties.
+ if (!key->IsString())
+ continue;
+
+ // Ensure that the property actually exists.
+ if (!val->HasRealNamedProperty(key->ToString()))
+ continue;
+
+ // Skip named callbacks from objects that have internal fields:
+ // crbug.com/139933
+ if (val->InternalFieldCount() > 0 &&
+ val->HasRealNamedCallbackProperty(key->ToString()))
Aaron Boodman 2012/08/04 11:34:19 Please add braces since the if statement is more t
eaugusti 2012/08/04 19:10:37 Done.
continue;
v8::String::Utf8Value name_utf8(key->ToString());

Powered by Google App Engine
This is Rietveld 408576698