From 08c7f32acf3af55bfca399e57d4bc79ecdba08cd Mon Sep 17 00:00:00 2001 From: Dmitry Volyntsev Date: Mon, 19 Nov 2018 16:30:35 +0300 Subject: [PATCH] Fixed various clang static analyzer warnings. In njs_object_keys_array() function. --- njs/njs_object.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/njs/njs_object.c b/njs/njs_object.c index 89d29996..e99725b3 100644 --- a/njs/njs_object.c +++ b/njs/njs_object.c @@ -959,33 +959,17 @@ njs_object_keys_array(njs_vm_t *vm, const njs_value_t *value) n = 0; - switch (value->type) { - case NJS_ARRAY: + if (array != NULL) { for (i = 0; i < length; i++) { if (njs_is_valid(&array->start[i])) { njs_uint32_to_string(&keys->start[n++], i); } } - break; - - case NJS_STRING: - case NJS_OBJECT_STRING: - if (value->type == NJS_OBJECT_STRING) { - string = &value->data.u.object_value->value; - - } else { - string = (njs_value_t *) value; - } - + } else if (length != 0) { for (i = 0; i < length; i++) { njs_uint32_to_string(&keys->start[n++], i); } - - break; - - default: - break; } if (nxt_fast_path(hash != NULL)) { -- 2.47.3