Improved checking that filename is not empty.

file->start can be non NULL for empty string.

diff --git a/njs/njs_parser.c b/njs/njs_parser.c
index 25080c4caa31ae98cc1453bd6ff989d759f4099d..97731eb5af76a975afd4066801ed5a07ce0105a7 100644 (file)
--- a/njs/njs_parser.c
+++ b/njs/njs_parser.c
@@ -233,7 +233,7 @@ njs_parser_scope_begin(njs_vm_t *vm, njs_parser_t *parser, njs_scope_t type)
     scope->values[0] = values;
     scope->values[1] = NULL;
 
-    if (parser->lexer->file.start != NULL) {
+    if (parser->lexer->file.length != 0) {
         ret = njs_name_copy(vm, &scope->file, &parser->lexer->file);
         if (nxt_slow_path(ret != NXT_OK)) {
             return NXT_ERROR;
@@ -2758,7 +2758,7 @@ njs_parser_trace_handler(nxt_trace_t *trace, nxt_trace_data_t *td,
     if (vm->parser != NULL) {
         lexer = vm->parser->lexer;
 
-        if (lexer->file.start != NULL) {
+        if (lexer->file.length != 0) {
             njs_internal_error(vm, "%s in %V:%uD", start, &lexer->file,
                                lexer->line);
         } else {
@@ -2795,7 +2795,7 @@ njs_parser_scope_error(njs_vm_t *vm, njs_parser_scope_t *scope,
         p = end - width;
     }
 
-    if (file->start != NULL) {
+    if (file->length != 0) {
         p = nxt_sprintf(p, end, " in %V:%uD", file, line);
 
     } else {