Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 425398 passed 0 identifier [@ NS_ConvertUTF8toUTF16 - doGetIdentifier - _getstringidentifier]

Browse Source 
r=jst sr=jst a=beltzner


git-svn-id: svn://10.0.0.236/trunk@248865 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org
2008-03-30 14:55:42 +00:00
parent 61a5f8d8da
commit 51c949da69
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/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;
}
}
}