Fix uncatchable error inside a promise (#810)

Author: laishere

quickjs.c

@@ -17998,20 +17998,30 @@ static int js_async_function_resolve_create(JSContext *ctx,
     return 0;
 }
 
-static void js_async_function_resume(JSContext *ctx, JSAsyncFunctionData *s)
+static BOOL js_async_function_resume(JSContext *ctx, JSAsyncFunctionData *s)
 {
+    BOOL is_success = TRUE;
     JSValue func_ret, ret2;
 
     func_ret = async_func_resume(ctx, &s->func_state);
     if (JS_IsException(func_ret)) {
         JSValue error;
     fail:
         error = JS_GetException(ctx);
-        ret2 = JS_Call(ctx, s->resolving_funcs[1], JS_UNDEFINED,
+        if (unlikely(JS_IsUncatchableError(ctx, error))) {
+            JS_Throw(ctx, error);
+            is_success = FALSE;
+        } else {
+            ret2 = JS_Call(ctx, s->resolving_funcs[1], JS_UNDEFINED,
                        1, &error);
-        JS_FreeValue(ctx, error);
+            if (unlikely(JS_IsException(ret2))) {
+                /* should only be uncatchable error */
+                is_success = FALSE;
+            }
+            JS_FreeValue(ctx, error);
+            JS_FreeValue(ctx, ret2);
+        }
         js_async_function_terminate(ctx->rt, s);
-        JS_FreeValue(ctx, ret2); /* XXX: what to do if exception ? */
     } else {
         JSValue value;
         value = s->func_state.frame.cur_sp[-1];
@@ -18020,7 +18030,11 @@ static void js_async_function_resume(JSContext *ctx, JSAsyncFunctionData *s)
             /* function returned */
             ret2 = JS_Call(ctx, s->resolving_funcs[0], JS_UNDEFINED,
                            1, &value);
-            JS_FreeValue(ctx, ret2); /* XXX: what to do if exception ? */
+            if (unlikely(JS_IsException(ret2))) {
+                /* should only be uncatchable error */
+                is_success = FALSE;
+            }
+            JS_FreeValue(ctx, ret2);
             JS_FreeValue(ctx, value);
             js_async_function_terminate(ctx->rt, s);
         } else {
@@ -18053,6 +18067,7 @@ static void js_async_function_resume(JSContext *ctx, JSAsyncFunctionData *s)
                 goto fail;
         }
     }
+    return is_success;
 }
 
 static JSValue js_async_function_resolve_call(JSContext *ctx,
@@ -18077,7 +18092,9 @@ static JSValue js_async_function_resolve_call(JSContext *ctx,
         /* return value of await */
         s->func_state.frame.cur_sp[-1] = js_dup(arg);
     }
-    js_async_function_resume(ctx, s);
+    if (!js_async_function_resume(ctx, s)) {
+        return JS_EXCEPTION;
+    }
     return JS_UNDEFINED;
 }
 
@@ -18109,7 +18126,9 @@ static JSValue js_async_function_call(JSContext *ctx, JSValue func_obj,
     }
     s->is_active = TRUE;
 
-    js_async_function_resume(ctx, s);
+    if (!js_async_function_resume(ctx, s)) {
+        goto fail;
+    }
 
     js_async_function_free(ctx->rt, s);
 
@@ -48605,8 +48624,13 @@ static JSValue promise_reaction_job(JSContext *ctx, int argc,
         res = JS_Call(ctx, handler, JS_UNDEFINED, 1, &arg);
     }
     is_reject = JS_IsException(res);
-    if (is_reject)
+    if (is_reject) {
         res = JS_GetException(ctx);
+        if (unlikely(JS_IsUncatchableError(ctx, res))) {
+            JS_Throw(ctx, res);
+            return JS_EXCEPTION;
+        }
+    }
     func = argv[is_reject];
     /* as an extension, we support undefined as value to avoid
        creating a dummy promise in the 'await' implementation of async