From 9c3a4f0bac65da39fe6ec25a95875b059a51585c Mon Sep 17 00:00:00 2001 From: Roman Arutyunyan Date: Fri, 27 Jan 2017 16:45:34 +0300 Subject: [PATCH] Initialize global variables in njs virtual machines. Previously, global variables in njs code remained uninitialized even if an initializer existed in njs code. To fix this, njs_vm_run() function is called right after a virtual machine is cloned. This call initializes global variables. --- nginx/ngx_http_js_module.c | 4 ++++ nginx/ngx_stream_js_module.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c index 104ca71f..b2e84481 100644 --- a/nginx/ngx_http_js_module.c +++ b/nginx/ngx_http_js_module.c @@ -573,6 +573,10 @@ ngx_http_js_init_vm(ngx_http_request_t *r) return NGX_ERROR; } + if (njs_vm_run(ctx->vm) != NJS_OK) { + return NGX_ERROR; + } + ctx->args = &jlcf->args[0]; return NGX_OK; diff --git a/nginx/ngx_stream_js_module.c b/nginx/ngx_stream_js_module.c index 43fb84df..13597b18 100644 --- a/nginx/ngx_stream_js_module.c +++ b/nginx/ngx_stream_js_module.c @@ -668,6 +668,10 @@ ngx_stream_js_init_vm(ngx_stream_session_t *s) return NGX_ERROR; } + if (njs_vm_run(ctx->vm) != NJS_OK) { + return NGX_ERROR; + } + ctx->arg = &jscf->arg; return NGX_OK; -- 2.47.3