From 7e8bca718b5e844c4c05a414bc27730e0fb1a338 Mon Sep 17 00:00:00 2001 From: Dmitry Volyntsev Date: Mon, 17 Jul 2017 15:29:02 +0300 Subject: [PATCH] Initialize njs_vm_opt_t structs to 0 to simplify options adding. --- nginx/ngx_http_js_module.c | 3 ++- nginx/ngx_stream_js_module.c | 3 ++- njs/test/njs_benchmark.c | 4 ++-- njs/test/njs_unit_test.c | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c index d3b8d6da..e81c3116 100644 --- 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 454e6a6d..b8f845ff 100644 --- 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 8d60a7f8..194bde37 100644 --- 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 d589afb3..a62caf4e 100644 --- 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); -- 2.47.3