Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug 169753: NPN_GetURL and friends fail if called before NPP_New returns r=av sr=heikki

Browse Source
This commit is contained in:
peterlubczynski%netscape.com 2002-09-20 00:17:28 +00:00
parent 91c00f9cca
commit de1d2ad8a8
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/plugin/base/src/ns4xPluginInstance.cpp
View File

@ -800,6 +800,13 @@ nsresult ns4xPluginInstance::InitializePlugin(nsIPluginInstancePeer* peer)
}
#endif
// Assign mPeer now and mark this instance as started before calling NPP_New
// because the plugin may call other NPAPI functions, like NPN_GetURLNotify,
// that assume these are set before returning. If the plugin returns failure,
// we'll clear them out below.
mPeer = peer;
mStarted = PR_TRUE;
NS_TRY_SAFE_CALL_RETURN(error, CallNPP_NewProc(fCallbacks->newp,
(char *)mimetype,
&fNPP,
@ -813,13 +820,13 @@ nsresult ns4xPluginInstance::InitializePlugin(nsIPluginInstancePeer* peer)
("NPP New called: this=%p, npp=%p, mime=%s, mode=%d, argc=%d, return=%d\n",
this, &fNPP, mimetype, mode, count, error));
if(error != NPERR_NO_ERROR)
if(error != NPERR_NO_ERROR) {
// since the plugin returned failure, these should not be set
mPeer = nsnull;
mStarted = PR_FALSE;
return NS_ERROR_FAILURE;
// assign mPeer only if there was no error
mPeer = peer;
mStarted = PR_TRUE;
}
return NS_OK;
}