Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bc7afcb9: Merge "free the NPObject in NPP_Destroy." into eclair-mr2

Browse Source 
Merge commit 'bc7afcb94688dedb0ae9b4b3415f46aa13e713e5' into eclair-mr2-plus-aosp

* commit 'bc7afcb94688dedb0ae9b4b3415f46aa13e713e5':
  free the NPObject in NPP_Destroy.
This commit is contained in:
Grace Kloba
2010-01-04 10:01:24 -08:00
committed by Android Git Automerger
parent 9002eb4404 bc7afcb946
commit 8d562f78b4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/BrowserTestPlugin/jni/main.cpp
View File

@@ -168,7 +168,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->subPlugin;
if (obj) {
delete obj->subPlugin;
browser->releaseobject(&obj->header);
}
return NPERR_NO_ERROR;
}