brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

browser-plugin: Fix the browser plugin

Browse Source 
commit 26991988cb broke the browser plugin
by trying to reference a uninitialized pointer and making the NPAPI retain
a NULL object.

https://bugzilla.gnome.org/show_bug.cgi?id=668517
This commit is contained in:
Jasper St. Pierre 2012-01-30 19:25:31 -05:00
parent 73261a4a66
commit 2c9e6bb589
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser-plugin/browser-plugin.c
View File

@ -822,8 +822,8 @@ plugin_object_set_callback (NPObject **listener,
if (NPVARIANT_IS_OBJECT (*value)) if (NPVARIANT_IS_OBJECT (*value))
{ {
funcs.retainobject (*listener);
*listener = NPVARIANT_TO_OBJECT (*value); *listener = NPVARIANT_TO_OBJECT (*value);
funcs.retainobject (*listener);
} }
return TRUE; return TRUE;
@ -836,6 +836,8 @@ plugin_object_set_property (NPObject *npobj,
{ {
PluginObject *obj; PluginObject *obj;
obj = (PluginObject *)npobj;
if (name == onextension_changed_id) if (name == onextension_changed_id)
return plugin_object_set_callback (&obj->listener, value); return plugin_object_set_callback (&obj->listener, value);