Fixed segfault at error message in njs_property_query().

The issue was introduced in b28e50b1 (0.9.0).
This closes #918 issue on Github.

diff --git a/src/njs_generator.c b/src/njs_generator.c
index a6209cce91c78e32c1260d18ba998e7e9463e36c..e8c61c0a6abbf37272159c8ffe2a7ada8fd4cdba 100644 (file)
--- a/src/njs_generator.c
+++ b/src/njs_generator.c
@@ -5491,7 +5491,7 @@ njs_generate_reference_error(njs_vm_t *vm, njs_generator_t *generator,
 
     ref_err->type = NJS_OBJ_TYPE_REF_ERROR;
 
-    njs_lexer_entry(vm, node->u.reference.atom_id, &entry);
+    njs_atom_string_get(vm, node->u.reference.atom_id, &entry);
 
     return njs_name_copy(vm, &ref_err->u.name, &entry);
 }

diff --git a/src/njs_lexer.h b/src/njs_lexer.h
index 42f612a63920a39962b447d25a9039cae9ad9c60..3728e2536c64e79665d90d21fffd0b6f7376bdd6 100644 (file)
--- a/src/njs_lexer.h
+++ b/src/njs_lexer.h
@@ -288,16 +288,6 @@ const njs_lexer_keyword_entry_t *njs_lexer_keyword(const u_char *key,
 njs_int_t njs_lexer_keywords(njs_arr_t *array);
 
 
-njs_inline void
-njs_lexer_entry(njs_vm_t *vm, uintptr_t atom_id, njs_str_t *entry)
-{
-    njs_value_t  value;
-
-    njs_atom_to_value(vm, &value, atom_id);
-    njs_string_get(vm, &value, entry);
-}
-
-
 njs_inline njs_bool_t
 njs_lexer_token_is_keyword(njs_lexer_token_t *token)
 {

diff --git a/src/njs_object.h b/src/njs_object.h
index 6b2438df2f9eb508402d6ab316c946f5e598e456..85e914d491f97eb769a896f76c66b3e8f49ee073 100644 (file)
--- a/src/njs_object.h
+++ b/src/njs_object.h
@@ -241,18 +241,17 @@ njs_key_string_get(njs_vm_t *vm, njs_value_t *key, njs_str_t *str)
 }
 
 
-njs_inline njs_int_t
+njs_inline void
 njs_atom_string_get(njs_vm_t *vm, uint32_t atom_id, njs_str_t *str)
 {
     njs_value_t  value;
 
     if (njs_atom_to_value(vm, &value, atom_id) != NJS_OK) {
-        return NJS_ERROR;
+        str->start = (u_char *) "unknown";
+        str->length = njs_length("unknown");
     }
 
     njs_key_string_get(vm, &value, str);
-
-    return NJS_OK;
 }
 
 

diff --git a/src/njs_parser.c b/src/njs_parser.c
index 50cee6726ca1327aacdcc1b24081ee1586035158..3cd56fdf77679008f8ef5ff521474f576ed87b80 100644 (file)
--- a/src/njs_parser.c
+++ b/src/njs_parser.c
@@ -6702,7 +6702,6 @@ njs_parser_labelled_statement_after(njs_parser_t *parser,
     njs_int_t          ret;
     njs_str_t          str;
     uintptr_t          atom_id;
-    njs_value_t        entry;
     njs_parser_node_t  *node;
 
     node = parser->node;
@@ -6719,8 +6718,7 @@ njs_parser_labelled_statement_after(njs_parser_t *parser,
 
     atom_id = (uint32_t) (uintptr_t) parser->target;
 
-    njs_atom_to_value(parser->vm, &entry, atom_id);
-    njs_string_get(parser->vm, &entry, &str);
+    njs_atom_string_get(parser->vm, atom_id, &str);
 
     ret = njs_name_copy(parser->vm, &parser->node->name, &str);
     if (ret != NJS_OK) {

diff --git a/src/njs_value.c b/src/njs_value.c
index dcdab5a217576a66f8dff911c3e51a40474627d4..a097e575aec8f1148d1e868dbbe0ca0f136f9a34 100644 (file)
--- a/src/njs_value.c
+++ b/src/njs_value.c
@@ -560,7 +560,6 @@ njs_property_query(njs_vm_t *vm, njs_property_query_t *pq, njs_value_t *value,
 {
     uint32_t        index;
     njs_int_t       ret;
-    njs_value_t     key;
     njs_object_t    *obj;
     njs_function_t  *function;
 
@@ -607,19 +606,9 @@ njs_property_query(njs_vm_t *vm, njs_property_query_t *pq, njs_value_t *value,
     case NJS_UNDEFINED:
     case NJS_NULL:
     default:
-        ret = njs_atom_to_value(vm, &key, atom_id);
-
-        if (njs_fast_path(ret == NJS_OK)) {
-            njs_string_get(vm, &key, &pq->lhq.key);
-            njs_type_error(vm, "cannot get property \"%V\" of %s",
-                           &pq->lhq.key, njs_is_null(value) ? "null"
-                                                            : "undefined");
-            return NJS_ERROR;
-        }
-
-        njs_type_error(vm, "cannot get property \"unknown\" of %s",
-                       njs_is_null(value) ? "null" : "undefined");
-
+        njs_atom_string_get(vm, atom_id, &pq->lhq.key);
+        njs_type_error(vm, "cannot get property \"%V\" of %s", &pq->lhq.key,
+                       njs_type_string(value->type));
         return NJS_ERROR;
     }
 

diff --git a/src/njs_variable.c b/src/njs_variable.c
index 78bd2afb3b79b7735ba6c6faf62ac5ec28825ede..40924ccf0f969cae13bdc2940cfece8ad9cc8235 100644 (file)
--- a/src/njs_variable.c
+++ b/src/njs_variable.c
@@ -239,7 +239,7 @@ njs_variable_scope_find(njs_parser_t *parser, njs_parser_scope_t *scope,
 
 failed:
 
-    njs_lexer_entry(parser->vm, atom_id, &entry);
+    njs_atom_string_get(parser->vm, atom_id, &entry);
 
     njs_parser_syntax_error(parser, "\"%V\" has already been declared", &entry);
     return NULL;

diff --git a/src/test/njs_unit_test.c b/src/test/njs_unit_test.c
index 2227c0a6316258ef342c8bb9c149b98953a1e9db..27fcbd82a36ee5195cca1f8a516b96049a8c64ea 100644 (file)
--- a/src/test/njs_unit_test.c
+++ b/src/test/njs_unit_test.c
@@ -3923,6 +3923,9 @@ static njs_unit_test_t  njs_test[] =
     { njs_str("delete this !== true"),
       njs_str("false") },
 
+    { njs_str("undefined[Symbol()]"),
+      njs_str("TypeError: cannot get property \"Symbol()\" of undefined") },
+
     /* Object shorthand methods. */
 
     { njs_str("var o = {m(){}}; new o.m();"),