From: Vadim Zhestikov <v.zhestikov@f5.com>
Date: Wed, 26 Oct 2022 23:33:15 +0000 (-0700)
Subject: Fixed static analyzer issues.
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=5e8e5fe4343c6fd6343f2bfdb8b830a8fb6e3690;p=njs.git

Fixed static analyzer issues.
---

diff --git a/src/njs_builtin.c b/src/njs_builtin.c
index 6c0c7786..bcffed9a 100644
--- a/src/njs_builtin.c
+++ b/src/njs_builtin.c
@@ -390,6 +390,11 @@ njs_builtin_traverse(njs_vm_t *vm, njs_traverse_t *traverse, void *data)
         }
     }
 
+    if (traverse == NULL) {
+        njs_type_error(vm, "njs_builtin_traverse() traverse arg is NULL");
+        return NJS_ERROR;
+    }
+
     n = 0;
 
     while (traverse != NULL) {
diff --git a/src/njs_object.c b/src/njs_object.c
index cc3bc02d..0ccbeff0 100644
--- a/src/njs_object.c
+++ b/src/njs_object.c
@@ -2372,7 +2372,7 @@ njs_object_prototype_has_own_property(njs_vm_t *vm, njs_value_t *args,
 
     case NJS_ERROR:
     default:
-        return ret;
+        return NJS_ERROR;
     }
 }
 
@@ -2420,7 +2420,7 @@ njs_object_prototype_prop_is_enumerable(njs_vm_t *vm, njs_value_t *args,
 
     case NJS_ERROR:
     default:
-        return ret;
+        return NJS_ERROR;
     }
 
     vm->retval = *retval;
diff --git a/src/njs_object_prop.c b/src/njs_object_prop.c
index d6e0c27f..2acc2f42 100644
--- a/src/njs_object_prop.c
+++ b/src/njs_object_prop.c
@@ -842,7 +842,7 @@ njs_object_prop_descriptor(njs_vm_t *vm, njs_value_t *dest,
 
     case NJS_ERROR:
     default:
-        return ret;
+        return NJS_ERROR;
     }
 
     desc = njs_object_alloc(vm);
diff --git a/src/njs_value.c b/src/njs_value.c
index 48cf9ed3..d6f1eb2a 100644
--- a/src/njs_value.c
+++ b/src/njs_value.c
@@ -1108,7 +1108,7 @@ slow_path:
     case NJS_ERROR:
     default:
 
-        return ret;
+        return NJS_ERROR;
     }
 
     return NJS_OK;
@@ -1282,7 +1282,7 @@ slow_path:
     case NJS_ERROR:
     default:
 
-        return ret;
+        return NJS_ERROR;
     }
 
     if (njs_slow_path(!njs_object(value)->extensible)) {
diff --git a/src/njs_vmcode.c b/src/njs_vmcode.c
index 4fd13249..6afd0413 100644
--- a/src/njs_vmcode.c
+++ b/src/njs_vmcode.c
@@ -103,7 +103,6 @@ njs_vmcode_interpreter(njs_vm_t *vm, u_char *pc, void *promise_cap,
     njs_native_frame_t           *previous, *native;
     njs_property_next_t          *next;
     njs_vmcode_import_t          *import;
-    njs_vmcode_finally_t         *finally;
     njs_vmcode_generic_t         *vmcode;
     njs_vmcode_variable_t        *var;
     njs_vmcode_prop_get_t        *get;
@@ -1722,9 +1721,6 @@ NEXT_LBL;
 
         value2 = (njs_value_t *) vmcode->operand1;
 
-        finally = (njs_vmcode_finally_t *) pc;
-        value1 = njs_scope_value(vm, finally->exit_value);
-
         ret = njs_vmcode_finally(vm, NULL, value2, pc);
 
         switch (ret) {