Modules: decouple QuickJS dump buffers from the request engine pool

Module-level logging dereferenced ctx->engine before clone publication.
Formatting only needs the current JSContext, not a published request
engine.  Pool-backed js_set results also coupled nginx variable storage
to the engine's lifetime.

Return temporary runtime-owned dump buffers and release them immediately
after logging.  Copy js_set results to the request or session pool and
release the temporary buffer, including on allocation failure.  Keep the
njs conversion path unchanged.

diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c
index d36796c069d8595f5510775756a00c219581194b..1ed20f10b90ab92df908213a91415070ae24b6cd 100644 (file)
--- a/nginx/ngx_http_js_module.c
+++ b/nginx/ngx_http_js_module.c
@@ -2090,7 +2090,7 @@ ngx_http_js_variable_set(ngx_http_request_t *r, ngx_http_variable_value_t *v,
         return NGX_ERROR;
     }
 
-    if (ctx->engine->string(ctx->engine, &ctx->retval, &value) != NGX_OK) {
+    if (ngx_js_ctx_string((ngx_js_ctx_t *) ctx, r->pool, &value) != NGX_OK) {
         return NGX_ERROR;
     }
 

diff --git a/nginx/ngx_js.c b/nginx/ngx_js.c
index 77fd0b26425510343d721b8db71f06470e73e454..523799c3c269fb78db4dc5896c96b13ee8190a8b 100644 (file)
--- a/nginx/ngx_js.c
+++ b/nginx/ngx_js.c
@@ -118,7 +118,7 @@ static void ngx_qjs_rejection_tracker(JSContext *ctx, JSValueConst promise,
     JSValueConst reason, JS_BOOL is_handled, void *opaque);
 
 static JSValue ngx_qjs_value(JSContext *cx, const ngx_str_t *path);
-static ngx_int_t ngx_qjs_dump_obj(ngx_engine_t *e, JSValueConst val,
+static ngx_int_t ngx_qjs_dump_obj(JSContext *cx, JSValueConst val,
     ngx_str_t *dst);
 
 static JSModuleDef *ngx_qjs_core_init(JSContext *cx, const char *name);
@@ -1286,7 +1286,7 @@ static ngx_int_t
 ngx_engine_qjs_string(ngx_engine_t *e, njs_opaque_value_t *value,
     ngx_str_t *str)
 {
-    return ngx_qjs_dump_obj(e, ngx_qjs_arg(*value), str);
+    return ngx_qjs_dump_obj(e->u.qjs.ctx, ngx_qjs_arg(*value), str);
 }
 
 
@@ -1519,13 +1519,12 @@ ngx_qjs_value(JSContext *cx, const ngx_str_t *path)
 
 
 static ngx_int_t
-ngx_qjs_dump_obj(ngx_engine_t *e, JSValueConst val, ngx_str_t *dst)
+ngx_qjs_dump_obj(JSContext *cx, JSValueConst val, ngx_str_t *dst)
 {
     size_t      len, byte_offset, byte_length;
     u_char     *start, *p;
     JSValue     buffer, stack;
     ngx_str_t   str, stack_str;
-    JSContext  *cx;
 
     if (JS_IsNullOrUndefined(val)) {
         dst->data = NULL;
@@ -1533,8 +1532,6 @@ ngx_qjs_dump_obj(ngx_engine_t *e, JSValueConst val, ngx_str_t *dst)
         return NGX_OK;
     }
 
-    cx = e->u.qjs.ctx;
-
     buffer = JS_GetTypedArrayBuffer(cx, val, &byte_offset, &byte_length, NULL);
     if (!JS_IsException(buffer)) {
         start = JS_GetArrayBuffer(cx, &dst->len, buffer);
@@ -1545,7 +1542,7 @@ ngx_qjs_dump_obj(ngx_engine_t *e, JSValueConst val, ngx_str_t *dst)
             start += byte_offset;
             dst->len = byte_length;
 
-            dst->data = njs_mp_alloc(e->pool, dst->len);
+            dst->data = js_malloc(cx, njs_max(dst->len, 1));
             if (dst->data == NULL) {
                 return NGX_ERROR;
             }
@@ -1577,9 +1574,10 @@ ngx_qjs_dump_obj(ngx_engine_t *e, JSValueConst val, ngx_str_t *dst)
             len += stack_str.len + njs_length("\n");
         }
 
-        start = njs_mp_alloc(e->pool, len);
+        start = js_malloc(cx, njs_max(len, 1));
         if (start == NULL) {
             JS_FreeCString(cx, (char *) str.data);
+            JS_FreeCString(cx, (char *) stack_str.data);
             JS_FreeValue(cx, stack);
             return NGX_ERROR;
         }
@@ -1598,7 +1596,7 @@ ngx_qjs_dump_obj(ngx_engine_t *e, JSValueConst val, ngx_str_t *dst)
     } else {
         len = njs_length("[exception]");
 
-        start = njs_mp_alloc(e->pool, len);
+        start = js_malloc(cx, len);
         if (start == NULL) {
             return NGX_ERROR;
         }
@@ -1645,17 +1643,21 @@ ngx_qjs_log_exception(ngx_engine_t *e, ngx_log_t *log, const char *txt)
 {
     JSValue    exception;
     ngx_str_t  s;
+    JSContext  *cx;
 
-    exception = JS_GetException(e->u.qjs.ctx);
-    if (ngx_qjs_dump_obj(e, exception, &s) != NGX_OK) {
+    cx = e->u.qjs.ctx;
+    exception = JS_GetException(cx);
+    if (ngx_qjs_dump_obj(cx, exception, &s) != NGX_OK) {
         ngx_log_error(NGX_LOG_ERR, log, 0, "js can't get %s", txt);
+        JS_FreeValue(cx, exception);
 
         return NGX_ERROR;
     }
 
     ngx_log_error(NGX_LOG_ERR, log, 0, "js %s: %V", txt, &s);
 
-    JS_FreeValue(e->u.qjs.ctx, exception);
+    js_free(cx, s.data);
+    JS_FreeValue(cx, exception);
 
     return NGX_OK;
 }
@@ -2030,7 +2032,6 @@ ngx_qjs_ext_log(JSContext *cx, JSValueConst this_val, int argc,
     char              *p;
     uint32_t           level;
     ngx_str_t          msg;
-    ngx_js_ctx_t      *ctx;
     ngx_connection_t  *c;
 
     p = JS_GetContextOpaque(cx);
@@ -2049,15 +2050,15 @@ ngx_qjs_ext_log(JSContext *cx, JSValueConst this_val, int argc,
         argv++;
     }
 
-    ctx = ngx_qjs_external_ctx(cx, p);
     c = ngx_qjs_external_connection(cx, p);
 
     for ( ; argc > 0; argc--, argv++) {
-        if (ngx_qjs_dump_obj(ctx->engine, argv[0], &msg) != NGX_OK) {
+        if (ngx_qjs_dump_obj(cx, argv[0], &msg) != NGX_OK) {
             return JS_EXCEPTION;
         }
 
         ngx_js_logger(c, level, (u_char *) msg.data, msg.len);
+        js_free(cx, msg.data);
     }
 
     return JS_UNDEFINED;
@@ -2732,6 +2733,48 @@ ngx_js_ctx_destroy(ngx_js_ctx_t *ctx)
 }
 
 
+ngx_int_t
+ngx_js_ctx_string(ngx_js_ctx_t *ctx, ngx_pool_t *pool, ngx_str_t *str)
+{
+    ngx_int_t      rc;
+    ngx_str_t      value;
+    ngx_engine_t  *e;
+
+    e = ctx->engine;
+
+    rc = e->string(e, &ctx->retval, &value);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    if (e->type == NGX_ENGINE_NJS) {
+        *str = value;
+        return NGX_OK;
+    }
+
+#if (NJS_HAVE_QUICKJS)
+    str->len = value.len;
+    str->data = NULL;
+
+    if (value.len != 0) {
+        str->data = ngx_pnalloc(pool, value.len);
+        if (str->data == NULL) {
+            rc = NGX_ERROR;
+
+        } else {
+            ngx_memcpy(str->data, value.data, value.len);
+        }
+    }
+
+    js_free(e->u.qjs.ctx, value.data);
+
+    return rc;
+#else
+    return NGX_ERROR;
+#endif
+}
+
+
 static njs_int_t
 ngx_js_core_init(njs_vm_t *vm)
 {

diff --git a/nginx/ngx_js.h b/nginx/ngx_js.h
index 3a70df0fe404b767278ab858ddfbaca91a6ecc0b..ec1f536ab1033a03306185ec823ce17ea65c5732 100644 (file)
--- a/nginx/ngx_js.h
+++ b/nginx/ngx_js.h
@@ -359,6 +359,8 @@ void ngx_js_ctx_init(ngx_js_ctx_t *ctx, ngx_log_t *log);
 
 
 void ngx_js_ctx_destroy(ngx_js_ctx_t *ctx);
+ngx_int_t ngx_js_ctx_string(ngx_js_ctx_t *ctx, ngx_pool_t *pool,
+    ngx_str_t *str);
 ngx_int_t ngx_js_call(njs_vm_t *vm, njs_function_t *func,
     njs_opaque_value_t *args, njs_uint_t nargs);
 ngx_int_t ngx_js_log_exception(njs_vm_t *vm, ngx_log_t *log, const char *txt);

diff --git a/nginx/ngx_stream_js_module.c b/nginx/ngx_stream_js_module.c
index 5f4f602148e8ed43e3d8e782400306050b8bfe0b..f544e108e9d0f36c1792d1a554967d026203c3f8 100644 (file)
--- a/nginx/ngx_stream_js_module.c
+++ b/nginx/ngx_stream_js_module.c
@@ -1150,7 +1150,9 @@ ngx_stream_js_variable_set(ngx_stream_session_t *s,
         return NGX_ERROR;
     }
 
-    if (ctx->engine->string(ctx->engine, &ctx->retval, &value) != NGX_OK) {
+    if (ngx_js_ctx_string((ngx_js_ctx_t *) ctx, s->connection->pool, &value)
+        != NGX_OK)
+    {
         return NGX_ERROR;
     }