Initialize njs_vm_opt_t structs to 0 to simplify options adding.

diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c
index d3b8d6dabff8d0ba31acb61e724fa9f1e4a87183..e81c311626c4836f927df5a423c3583d6f88ab75 100644 (file)
--- a/nginx/ngx_http_js_module.c
+++ b/nginx/ngx_http_js_module.c
@@ -1319,8 +1319,9 @@ ngx_http_js_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
+    ngx_memzero(&options, sizeof(njs_vm_opt_t));
+
     options.mcp = mcp;
-    options.shared = NULL;
     options.externals = &externals;
 
     jlcf->vm = njs_vm_create(&options);

diff --git a/nginx/ngx_stream_js_module.c b/nginx/ngx_stream_js_module.c
index 454e6a6deb6230852ec4c713f90fd158c23bca3a..b8f845ff21aa0e99482834175093d1a9966c6718 100644 (file)
--- a/nginx/ngx_stream_js_module.c
+++ b/nginx/ngx_stream_js_module.c
@@ -1029,8 +1029,9 @@ ngx_stream_js_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
+    ngx_memzero(&options, sizeof(njs_vm_opt_t));
+
     options.mcp = mcp;
-    options.shared = NULL;
     options.externals = &externals;
 
     jscf->vm = njs_vm_create(&options);

diff --git a/njs/test/njs_benchmark.c b/njs/test/njs_benchmark.c
index 8d60a7f8bd52cc78a19bc22b742ca8653d731ef5..194bde372a64b248770e9e47e1a227dfed737f2e 100644 (file)
--- a/njs/test/njs_benchmark.c
+++ b/njs/test/njs_benchmark.c
@@ -88,9 +88,9 @@ njs_unit_test_benchmark(nxt_str_t *script, nxt_str_t *result, const char *msg,
         return NXT_ERROR;
     }
 
+    memset(&options, 0, sizeof(njs_vm_opt_t));
+
     options.mcp = mcp;
-    options.shared = NULL;
-    options.externals = NULL;
 
     vm = njs_vm_create(&options);
     if (vm == NULL) {

diff --git a/njs/test/njs_unit_test.c b/njs/test/njs_unit_test.c
index d589afb3eea8445923b3a3718d9461a1678c58c4..a62caf4ee2aa44e7d1ed9908ff3ab4a063e65045 100644 (file)
--- a/njs/test/njs_unit_test.c
+++ b/njs/test/njs_unit_test.c
@@ -8161,8 +8161,9 @@ njs_unit_test(nxt_bool_t disassemble)
                (int) njs_test[i].script.length, njs_test[i].script.start);
         fflush(stdout);
 
+        memset(&options, 0, sizeof(njs_vm_opt_t));
+
         options.mcp = mcp;
-        options.shared = NULL;
         options.externals = &externals;
 
         vm = njs_vm_create(&options);