Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d562f78 authored by Grace Kloba's avatar Grace Kloba Committed by Android Git Automerger
Browse files

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

Merge commit 'bc7afcb9' into eclair-mr2-plus-aosp

* commit 'bc7afcb9':
  free the NPObject in NPP_Destroy.
parents 9002eb44 bc7afcb9

tests/BrowserTestPlugin/jni/main.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -168,7 +168,10 @@ NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, 
NPError NPP_Destroy(NPP instance, NPSavedData** save)

NPError NPP_Destroy(NPP instance, NPSavedData** save)

{

{

    PluginObject *obj = (PluginObject*) instance->pdata;

    PluginObject *obj = (PluginObject*) instance->pdata;

    if (obj) {

        delete obj->subPlugin;

        delete obj->subPlugin;

        browser->releaseobject(&obj->header);

    }





    return NPERR_NO_ERROR;

    return NPERR_NO_ERROR;

}

}