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

Fix 427191 (r=igor, a=beltzner).

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@250064 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brendan%mozilla.org 2008-04-11 14:50:16 +00:00
parent 33e8a27d24
commit 10edcd5f4a
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/js/src/jsfun.c
View File

@ -2183,17 +2183,24 @@ js_ReportIsNotFunction(JSContext *cx, jsval *vp, uintN flags)
JSStackFrame *fp;
uintN error;
const char *name, *source;
JSTempValueRooter tvr;
for (fp = cx->fp; fp && !fp->regs; fp = fp->down)
continue;
name = NULL;
source = NULL;
name = source = NULL;
JS_PUSH_TEMP_ROOT_STRING(cx, NULL, &tvr);
if (flags & JSV2F_ITERATOR) {
error = JSMSG_BAD_ITERATOR;
name = js_iterator_str;
source = js_ValueToPrintableSource(cx, *vp);
tvr.u.string = js_ValueToSource(cx, *vp);
if (!tvr.u.string)
goto out;
tvr.u.string = js_QuoteString(cx, tvr.u.string, 0);
if (!tvr.u.string)
goto out;
source = js_GetStringBytes(cx, tvr.u.string);
if (!source)
return;
goto out;
} else if (flags & JSV2F_CONSTRUCT) {
error = JSMSG_NOT_CONSTRUCTOR;
} else {
@ -2209,6 +2216,9 @@ js_ReportIsNotFunction(JSContext *cx, jsval *vp, uintN flags)
: JSDVG_IGNORE_STACK,
*vp, NULL,
name, source);
out:
JS_POP_TEMP_ROOT(cx, &tvr);
}
/*