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 885770 - script filename can be NULL in shell load, r=njn

Browse Source 
--HG--
extra : rebase_source : 25392549ef586f651e03f5ce86c0ebac376f8c1e
This commit is contained in:
Steve Fink 2013-06-21 16:49:41 -07:00
parent b5251e2b36
commit 401b553098
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/src/shell/js.cpp
View File

@ -697,7 +697,8 @@ ResolvePath(JSContext *cx, HandleString filenameStr, bool scriptRelative)
/* Get the currently executing script's name. */
RootedScript script(cx, GetTopScript(cx));
JS_ASSERT(script && script->filename());
if (!script->filename())
return NULL;
if (strcmp(script->filename(), "-e") == 0 || strcmp(script->filename(), "typein") == 0)
scriptRelative = false;
@ -792,11 +793,15 @@ LoadScript(JSContext *cx, unsigned argc, jsval *vp, bool scriptRelative)
RootedString str(cx);
for (unsigned i = 0; i < args.length(); i++) {
str = JS_ValueToString(cx, args[i]);
if (!str)
if (!str) {
JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL, JSSMSG_INVALID_ARGS, "load");
return false;
}
str = ResolvePath(cx, str, scriptRelative);
if (!str)
if (!str) {
JS_ReportError(cx, "unable to resolve path");
return false;
}
JSAutoByteString filename(cx, str);
if (!filename)
return false;