From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 21 Mar 2017 13:14:16 +0000 (+0300)
Subject: Miscellaneous changes.
X-Git-Tag: 0.1.10~21
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=cf742db0b1442e285d0a65bb4f871b0d36b733c2;p=njs.git

Miscellaneous changes.
---

diff --git a/njs/njs_array.c b/njs/njs_array.c
index 2361c4f8..dfd9ac44 100644
--- a/njs/njs_array.c
+++ b/njs/njs_array.c
@@ -1295,7 +1295,7 @@ static njs_ret_t
 njs_array_prototype_fill(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
     njs_index_t unused)
 {
-    nxt_int_t    start, end, length;
+    nxt_int_t    i, start, end, length;
     njs_array_t  *array;
 
     vm->retval = args[0];
@@ -1346,8 +1346,8 @@ njs_array_prototype_fill(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
        }
     }
 
-    while (start < end) {
-        array->start[start++] = args[1];
+    for (i = start; i < end; i++) {
+        array->start[i] = args[1];
     }
 
     return NXT_OK;
diff --git a/nxt/test/rbtree_unit_test.c b/nxt/test/rbtree_unit_test.c
index e2766a73..c1347bfb 100644
--- a/nxt/test/rbtree_unit_test.c
+++ b/nxt/test/rbtree_unit_test.c
@@ -51,7 +51,7 @@ rbtree_unit_test(nxt_uint_t n)
 
     keys = malloc(n * sizeof(uint32_t));
     if (keys == NULL) {
-        free(keys);
+        free(items);
         return NXT_ERROR;
     }