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

Unified Diff: ppapi/proxy/ppb_var_deprecated_proxy.cc

Issue 10559095: Merge 143201 - Fix a crash in Pepper object scripting. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/
Patch Set: Created 8 years, 6 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: ppapi/proxy/ppb_var_deprecated_proxy.cc
===================================================================
--- ppapi/proxy/ppb_var_deprecated_proxy.cc (revision 143254)
+++ ppapi/proxy/ppb_var_deprecated_proxy.cc (working copy)
@@ -269,8 +269,10 @@
PP_Var ret_var = result.Return(dispatcher);
// Register this object as being implemented by the plugin.
- tracker->PluginImplementedObjectCreated(instance, ret_var,
- ppp_class, ppp_class_data);
+ if (ret_var.type == PP_VARTYPE_OBJECT) {
+ tracker->PluginImplementedObjectCreated(instance, ret_var,
+ ppp_class, ppp_class_data);
+ }
return ret_var;
}
« 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