am 653b97e: am a0e762c: free the NPObject in NPP_Destroy.

Grace Kloba · Android Git Automerger · commit 8cb876674408 · 2010-01-04T10:03:34.000-08:00
Merge commit '653b97e701546e816f75167280bf87b665a47b2c'

* commit '653b97e701546e816f75167280bf87b665a47b2c':
  free the NPObject in NPP_Destroy.
diff --git a/samples/BrowserPlugin/jni/main.cpp b/samples/BrowserPlugin/jni/main.cpp
@@ -245,7 +245,10 @@ NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
 NPError NPP_Destroy(NPP instance, NPSavedData** save)
 {
     PluginObject *obj = (PluginObject*) instance->pdata;
-    delete obj->activePlugin;
+    if (obj) {
+        delete obj->activePlugin;
+        browser->releaseobject(&obj->header);
+    }
 
     return NPERR_NO_ERROR;
 }

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,10 @@ NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,`
`245`	`245`	`NPError NPP_Destroy(NPP instance, NPSavedData** save)`
`246`	`246`	`{`
`247`	`247`	`PluginObject obj = (PluginObject) instance->pdata;`
`248`		`- delete obj->activePlugin;`
	`248`	`+ if (obj) {`
	`249`	`+ delete obj->activePlugin;`
	`250`	`+ browser->releaseobject(&obj->header);`
	`251`	`+ }`
`249`	`252`
`250`	`253`	`return NPERR_NO_ERROR;`
`251`	`254`	`}`