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 418638 - various bugs in JS shell scatter() and sleep(), patch by Jason Orendorff <jorendorff@mozilla.com>, r=crowder, a=NPOTB

Browse Source
This commit is contained in:
crowder@fiverocks.com 2008-02-20 15:18:20 -08:00
parent 1c905b7a5f
commit 5679bb6318
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/src/js.c
View File

@ -60,6 +60,7 @@
#include "jsfun.h"
#include "jsgc.h"
#include "jslock.h"
#include "jsnum.h"
#include "jsobj.h"
#include "jsparse.h"
#include "jsscope.h"
@ -2513,9 +2514,12 @@ Sleep(JSContext *cx, uintN argc, jsval *vp)
PRUint32 t_ticks;
jsrefcount rc;
if (!JS_ValueToNumber(cx, JS_ARGV(cx, vp)[0], &t_secs))
if (!JS_ConvertArguments(cx, argc, JS_ARGV(cx, vp), "d", &t_secs))
return JS_FALSE;
if (t_secs < 0 || JSDOUBLE_IS_NaN(t_secs))
t_secs = 0;
rc = JS_SuspendRequest(cx);
t_ticks = (PRUint32)(PR_TicksPerSecond() * t_secs);
if (PR_Sleep(t_ticks) == PR_SUCCESS)
@ -2630,6 +2634,8 @@ Scatter(JSContext *cx, uintN argc, jsval *vp)
ok = JS_GetArrayLength(cx, inArr, &n);
if (!ok)
goto out;
if (n == 0)
goto success;
sd.lock = PR_NewLock();
if (!sd.lock)
@ -2665,9 +2671,9 @@ Scatter(JSContext *cx, uintN argc, jsval *vp)
sd.threads[i].fn = JSVAL_NULL;
ok = JS_AddRoot(cx, &sd.threads[i].fn);
if (ok) {
ok = JS_GetElement(cx, inArr, (jsint) i, &sd.threads[i].fn);
i++; /* additional root to remove */
if (ok && !JS_GetElement(cx, inArr, (jsint) i, &sd.threads[i].fn)) {
JS_RemoveRoot(cx, &sd.threads[i].fn);
ok = JS_FALSE;
}
if (!ok) {
while (i-- > 0)
@ -2692,7 +2698,7 @@ Scatter(JSContext *cx, uintN argc, jsval *vp)
RunScatterThread,
&sd.threads[i],
PR_PRIORITY_NORMAL,
PR_LOCAL_THREAD,
PR_GLOBAL_THREAD,
PR_JOINABLE_THREAD,
0);
if (!t) {
@ -2721,6 +2727,7 @@ Scatter(JSContext *cx, uintN argc, jsval *vp)
}
JS_ResumeRequest(cx, rc);
success:
arr = JS_NewArrayObject(cx, n, sd.results);
if (!arr)
goto fail;