wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Initialize NPP structure's pdata pointer to NULL. Plugins can mistake an uninitialized non-NULL value for their own instance pointer and try to dereference it. b=555312 r=BenWa

Browse Source
This commit is contained in:
Josh Aas 2010-03-29 10:16:27 -04:00
parent 71160f4569
commit fc1d594cb2
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/plugins/PluginInstanceChild.cpp
View File

@ -100,6 +100,7 @@ PluginInstanceChild::PluginInstanceChild(const NPPluginFuncs* aPluginIface,
{
memset(&mWindow, 0, sizeof(mWindow));
mData.ndata = (void*) this;
mData.pdata = nsnull;
#if defined(MOZ_X11) && defined(XP_UNIX) && !defined(XP_MACOSX)
mWindow.ws_info = &mWsInfo;
memset(&mWsInfo, 0, sizeof(mWsInfo));

7
modules/plugin/test/testplugin/nptest.cpp
View File

@ -581,6 +581,13 @@ NPError OSCALL NP_Shutdown()
NPError
NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved)
{
// Make sure our pdata field is NULL at this point. If it isn't, that
// probably means the browser gave us uninitialized memory.
if (instance->pdata) {
printf("NPP_New called with non-NULL NPP->pdata pointer!\n");
return NPERR_GENERIC_ERROR;
}
// Make sure we can render this plugin
NPBool browserSupportsWindowless = false;
NPN_GetValue(instance, NPNVSupportsWindowless, &browserSupportsWindowless);