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

Unified Diff: src/api.cc

Issue 155685: Make sure we don't crash if NewProxy returns an empty handle (only... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 11 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/api.cc
===================================================================
--- src/api.cc (revision 2498)
+++ src/api.cc (working copy)
@@ -2480,7 +2480,7 @@
return NULL;
}
- // Unaligned native pointer
+ // Unaligned native pointer.
return reinterpret_cast<void*>(i::Proxy::cast(pointer)->proxy());
}
@@ -2492,12 +2492,12 @@
// Aligned pointer, store as is.
obj->SetInternalField(index, as_object);
} else {
- // Currently internal fields are used by DOM wrappers which
- // only get GCed by the mark-sweep collector,
- // so let's put proxy into old space.
- i::Proxy* proxy = *i::Factory::NewProxy(reinterpret_cast<i::Address>(value),
- i::TENURED);
- obj->SetInternalField(index, proxy);
+ // Currently internal fields are used by DOM wrappers which only
+ // get garbage collected by the mark-sweep collector, so we
+ // pretenure the proxy.
+ i::Handle<i::Proxy> proxy =
+ i::Factory::NewProxy(reinterpret_cast<i::Address>(value), i::TENURED);
+ if (!proxy.is_null()) obj->SetInternalField(index, *proxy);
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698