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

Bug 505839 JS_GetStringChars( JS_ValueToString(...)..) is a bad pattern

Browse Source 
r=dveditz

--HG--
extra : rebase_source : 12cf87f85df57e90d9a44919119f7977941a0b13
This commit is contained in:
timeless@mozdev.org 2010-03-12 07:50:10 +01:00
parent e41defe090
commit 50b1a6d96f
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
xpinstall/src/nsJSInstallTriggerGlobal.cpp
View File

@ -314,18 +314,41 @@ InstallTriggerGlobalInstall(JSContext *cx, JSObject *obj, uintN argc, jsval *arg
if ( JSVAL_IS_OBJECT(v) && JSVAL_TO_OBJECT(v) ) if ( JSVAL_IS_OBJECT(v) && JSVAL_TO_OBJECT(v) )
{ {
jsval v2; jsval v2;
if (JS_GetProperty( cx, JSVAL_TO_OBJECT(v), "URL", &v2 ) && !JSVAL_IS_VOID(v2)) if (JS_GetProperty( cx, JSVAL_TO_OBJECT(v), "URL", &v2 ) && !JSVAL_IS_VOID(v2)) {
URL = reinterpret_cast<const PRUnichar*>(JS_GetStringChars( JS_ValueToString( cx, v2 ) )); JSString *str = JS_ValueToString(cx, v2);
if (!str) {
abortLoad = PR_TRUE;
break;
}
URL = reinterpret_cast<const PRUnichar*>(JS_GetStringChars(str));
}
if (JS_GetProperty( cx, JSVAL_TO_OBJECT(v), "IconURL", &v2 ) && !JSVAL_IS_VOID(v2)) if (JS_GetProperty( cx, JSVAL_TO_OBJECT(v), "IconURL", &v2 ) && !JSVAL_IS_VOID(v2)) {
iconURL = reinterpret_cast<const PRUnichar*>(JS_GetStringChars( JS_ValueToString( cx, v2 ) )); JSString *str = JS_ValueToString(cx, v2);
if (!str) {
abortLoad = PR_TRUE;
break;
}
iconURL = reinterpret_cast<const PRUnichar*>(JS_GetStringChars(str));
}
if (JS_GetProperty( cx, JSVAL_TO_OBJECT(v), "Hash", &v2) && !JSVAL_IS_VOID(v2)) if (JS_GetProperty( cx, JSVAL_TO_OBJECT(v), "Hash", &v2) && !JSVAL_IS_VOID(v2)) {
hash = reinterpret_cast<const char*>(JS_GetStringBytes( JS_ValueToString( cx, v2 ) )); JSString *str = JS_ValueToString(cx, v2);
if (!str) {
abortLoad = PR_TRUE;
break;
}
hash = reinterpret_cast<const char*>(JS_GetStringBytes(str));
}
} }
else else
{ {
URL = reinterpret_cast<const PRUnichar*>(JS_GetStringChars( JS_ValueToString( cx, v ) )); JSString *str = JS_ValueToString(cx, v);
if (!str) {
abortLoad = PR_TRUE;
break;
}
URL = reinterpret_cast<const PRUnichar*>(JS_GetStringChars(str));
} }
if ( URL ) if ( URL )