mirrors/quickjs
1
0
Fork 0
mirror of https://github.com/bellard/quickjs.git synced 2025-05-15 10:45:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

ensure that JS_IteratorNext() returns JS_UNDEFINED when done = TRUE (#394)

Browse Source
This commit is contained in:
Fabrice Bellard 2025-03-31 13:37:37 +02:00
parent 2634856087
commit 0d7aaed71c
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
quickjs.c
View File

@ -15107,6 +15107,7 @@ static JSValue JS_IteratorNext2(JSContext *ctx, JSValueConst enum_obj,
return JS_EXCEPTION; return JS_EXCEPTION;
} }
/* Note: always return JS_UNDEFINED when *pdone = TRUE. */
static JSValue JS_IteratorNext(JSContext *ctx, JSValueConst enum_obj, static JSValue JS_IteratorNext(JSContext *ctx, JSValueConst enum_obj,
JSValueConst method, JSValueConst method,
int argc, JSValueConst *argv, BOOL *pdone) int argc, JSValueConst *argv, BOOL *pdone)
@ -15117,9 +15118,13 @@ static JSValue JS_IteratorNext(JSContext *ctx, JSValueConst enum_obj,
obj = JS_IteratorNext2(ctx, enum_obj, method, argc, argv, &done); obj = JS_IteratorNext2(ctx, enum_obj, method, argc, argv, &done);
if (JS_IsException(obj)) if (JS_IsException(obj))
goto fail; goto fail;
if (done != 2) { if (likely(done == 0)) {
*pdone = done; *pdone = FALSE;
return obj; return obj;
} else if (done != 2) {
JS_FreeValue(ctx, obj);
*pdone = TRUE;
return JS_UNDEFINED;
} else { } else {
done_val = JS_GetProperty(ctx, obj, JS_ATOM_done); done_val = JS_GetProperty(ctx, obj, JS_ATOM_done);
if (JS_IsException(done_val)) if (JS_IsException(done_val))
@ -37510,10 +37515,8 @@ static JSValue js_object_fromEntries(JSContext *ctx, JSValueConst this_val,
item = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done); item = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done);
if (JS_IsException(item)) if (JS_IsException(item))
goto fail; goto fail;
if (done) { if (done)
JS_FreeValue(ctx, item);
break; break;
}
key = JS_UNDEFINED; key = JS_UNDEFINED;
value = JS_UNDEFINED; value = JS_UNDEFINED;
@ -46550,10 +46553,8 @@ static JSValue js_map_constructor(JSContext *ctx, JSValueConst new_target,
item = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done); item = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done);
if (JS_IsException(item)) if (JS_IsException(item))
goto fail; goto fail;
if (done) { if (done)
JS_FreeValue(ctx, item);
break; break;
}
if (is_set) { if (is_set) {
ret = JS_Call(ctx, adder, obj, 1, (JSValueConst *)&item); ret = JS_Call(ctx, adder, obj, 1, (JSValueConst *)&item);
if (JS_IsException(ret)) { if (JS_IsException(ret)) {
@ -52686,10 +52687,8 @@ static JSValue js_array_from_iterator(JSContext *ctx, uint32_t *plen,
val = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done); val = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done);
if (JS_IsException(val)) if (JS_IsException(val))
goto fail; goto fail;
if (done) { if (done)
JS_FreeValue(ctx, val);
break; break;
}
if (JS_CreateDataPropertyUint32(ctx, arr, k, val, JS_PROP_THROW) < 0) if (JS_CreateDataPropertyUint32(ctx, arr, k, val, JS_PROP_THROW) < 0)
goto fail; goto fail;
k++; k++;