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

Bug 425398 passed 0 identifier [@ NS_ConvertUTF8toUTF16 - doGetIdentifier - _getstringidentifier] r=jst sr=jst a=beltzner

Browse Source
This commit is contained in:
timeless@mozdev.org 2008-03-30 07:55:42 -07:00
parent e03e3fc844
commit 58e9dcde09
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/plugin/base/src/ns4xPlugin.cpp
View File

@ -1471,7 +1471,7 @@ doGetIdentifier(JSContext *cx, const NPUTF8* name)
utf16name.Length());
if (!str)
return nsnull;
return NULL;
return (NPIdentifier)STRING_TO_JSVAL(str);
}
@ -1479,6 +1479,11 @@ doGetIdentifier(JSContext *cx, const NPUTF8* name)
NPIdentifier NP_CALLBACK
_getstringidentifier(const NPUTF8* name)
{
if (!name) {
NPN_PLUGIN_LOG(PLUGIN_LOG_ALWAYS, ("NPN_getstringidentifier: passed null name"));
return NULL;
}
nsCOMPtr<nsIThreadJSContextStack> stack =
do_GetService("@mozilla.org/js/xpc/ContextStack;1");
if (!stack)
@ -1510,7 +1515,12 @@ _getstringidentifiers(const NPUTF8** names, int32_t nameCount,
JSAutoRequest ar(cx);
for (int32_t i = 0; i < nameCount; ++i) {
identifiers[i] = doGetIdentifier(cx, names[i]);
if (names[i]) {
identifiers[i] = doGetIdentifier(cx, names[i]);
} else {
NPN_PLUGIN_LOG(PLUGIN_LOG_ALWAYS, ("NPN_getstringidentifiers: passed null name"));
identifiers[i] = NULL;
}
}
}