core: make sure close callbacks don't access the JS context

Author: saghul

src/fswatch.c

@@ -26,8 +26,9 @@
 #include "utils.h"
 
 typedef struct {
-    uv_fs_event_t handle;
     JSContext *ctx;
+    JSRuntime *rt;
+    uv_fs_event_t handle;
     JSValue callback;
     int closed;
     int finalized;
@@ -44,7 +45,7 @@ static void uv__fsevent_close_cb(uv_handle_t *handle) {
     if (fw) {
         fw->closed = 1;
         if (fw->finalized)
-            js_free(fw->ctx, fw);
+            js_free_rt(fw->rt, fw);
     }
 }
 
@@ -193,6 +194,7 @@ static JSValue tjs_fs_watch(JSContext *ctx, JSValueConst this_val, int argc, JSV
     JS_FreeCString(ctx, path);
 
     fw->ctx = ctx;
+    fw->rt = JS_GetRuntime(ctx);
     fw->handle.data = fw;
     fw->callback = JS_DupValue(ctx, argv[1]);
 

src/process.c

@@ -33,6 +33,7 @@ static JSClassID tjs_process_class_id;
 
 typedef struct {
     JSContext *ctx;
+    JSRuntime *rt;
     bool closed;
     bool finalized;
     uv_process_t process;
@@ -50,7 +51,7 @@ static void uv__close_cb(uv_handle_t *handle) {
     CHECK_NOT_NULL(p);
     p->closed = true;
     if (p->finalized)
-        js_free(p->ctx, p);
+        js_free_rt(p->rt, p);
 }
 
 static void maybe_close(TJSProcess *p) {
@@ -185,6 +186,7 @@ static JSValue tjs_spawn(JSContext *ctx, JSValueConst this_val, int argc, JSValu
     }
 
     p->ctx = ctx;
+    p->rt = JS_GetRuntime(ctx);
     p->process.data = p;
 
     TJS_ClearPromise(ctx, &p->status.result);

src/signals.c

@@ -28,6 +28,7 @@
 
 typedef struct {
     JSContext *ctx;
+    JSRuntime *rt;
     int closed;
     int finalized;
     uv_signal_t handle;
@@ -43,7 +44,7 @@ static void uv__signal_close_cb(uv_handle_t *handle) {
     if (sh) {
         sh->closed = 1;
         if (sh->finalized)
-            js_free(sh->ctx, sh);
+            js_free_rt(sh->rt, sh);
     }
 }
 
@@ -118,6 +119,7 @@ static JSValue tjs_signal(JSContext *ctx, JSValueConst this_val, int argc, JSVal
     uv_unref((uv_handle_t *) &sh->handle);
 
     sh->ctx = ctx;
+    sh->rt = JS_GetRuntime(ctx);
     sh->sig_num = sig_num;
     sh->handle.data = sh;
     sh->func = JS_DupValue(ctx, func);

src/udp.c

@@ -30,6 +30,7 @@
 
 typedef struct {
     JSContext *ctx;
+    JSRuntime *rt;
     int closed;
     int finalized;
     uv_udp_t udp;
@@ -56,7 +57,7 @@ static void uv__udp_close_cb(uv_handle_t *handle) {
     CHECK_NOT_NULL(u);
     u->closed = 1;
     if (u->finalized)
-        js_free(u->ctx, u);
+        js_free_rt(u->rt, u);
 }
 
 static void maybe_close(TJSUdp *u) {
@@ -296,6 +297,7 @@ static JSValue tjs_new_udp(JSContext *ctx, int af) {
     }
 
     u->ctx = ctx;
+    u->rt = JS_GetRuntime(ctx);
     u->closed = 0;
     u->finalized = 0;
 

src/worker.c

@@ -1,5 +1,5 @@
 /*
- * QuickJS libuv bindings
+ * txiki.js
  *
  * Copyright (c) 2019-present Saúl Ibarra Corretgé <s@saghul.net>
  *
@@ -50,6 +50,7 @@ typedef struct {
 
 typedef struct {
     JSContext *ctx;
+    JSRuntime *rt;
     union {
         uv_handle_t handle;
         uv_stream_t stream;
@@ -131,7 +132,7 @@ static void worker_entry(void *arg) {
 static void uv__close_cb(uv_handle_t *handle) {
     TJSWorker *w = handle->data;
     CHECK_NOT_NULL(w);
-    js_free(w->ctx, w);
+    js_free_rt(w->rt, w);
 }
 
 static void tjs_worker_finalizer(JSRuntime *rt, JSValue val) {
@@ -234,6 +235,7 @@ static JSValue tjs_new_worker(JSContext *ctx, uv_os_sock_t channel_fd, bool is_m
     }
 
     w->ctx = ctx;
+    w->rt = JS_GetRuntime(ctx);
     w->is_main = is_main;
     w->h.handle.data = w;