Fix static analyzer warnings

yatsukhnenko · yatsukhnenko · commit 42f1c9779b96 · 2017-08-15T15:24:06.000+03:00
diff --git a/common.h b/common.h
@@ -40,15 +40,14 @@ typedef struct {
     ) { \
         zend_string _zstr = {0}; \
         char *_str_index; uint _str_length; ulong _num_index; \
-        _val = zend_hash_get_current_data_ex(ht, &_hpos); \
+        _h = 0; _key = NULL; _val = zend_hash_get_current_data_ex(ht, &_hpos); \
         switch (zend_hash_get_current_key_ex(ht, &_str_index, &_str_length, &_num_index, 0, &_hpos)) { \
             case HASH_KEY_IS_STRING: \
                 _zstr.len = _str_length - 1; \
                 _zstr.val = _str_index; \
                 _key = &_zstr; \
                 break; \
             case HASH_KEY_IS_LONG: \
-                _key = NULL; \
                 _h = _num_index; \
                 break; \
             default: \
diff --git a/redis.c b/redis.c
@@ -2774,10 +2774,11 @@ redis_sock_read_multibulk_multi_reply_loop(INTERNAL_FUNCTION_PARAMETERS,
 {
     fold_item *fi;
 
-    for (fi = redis_sock->head; fi; fi = fi->next) {
+    for (fi = redis_sock->head; fi; /* void */) {
         if (fi->fun) {
             fi->fun(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, z_tab,
                 fi->ctx TSRMLS_CC);
+            fi = fi->next;
             continue;
         }
         size_t len;
@@ -2804,6 +2805,7 @@ redis_sock_read_multibulk_multi_reply_loop(INTERNAL_FUNCTION_PARAMETERS,
         int num = atol(inbuf + 1);
         if (num > 0 && redis_read_multibulk_recursive(redis_sock, num, z_ret TSRMLS_CC) < 0) {
         }
+        if (fi) fi = fi->next;
     }
     redis_sock->current = fi;
     return 0;
diff --git a/redis_array.c b/redis_array.c
@@ -1092,7 +1092,11 @@ PHP_METHOD(RedisArray, mset)
 #if (PHP_MAJOR_VERSION < 7)
             MAKE_STD_ZVAL(z_tmp);
 #endif
-            ZVAL_ZVAL(z_tmp, argv[i], 1, 0);
+            if (argv[i] == NULL) {
+                ZVAL_NULL(z_tmp);
+            } else {
+                ZVAL_ZVAL(z_tmp, argv[i], 1, 0);
+            }
             add_assoc_zval_ex(&z_argarray, keys[i], key_lens[i], z_tmp);
             found++;
         }

Original file line number	Diff line number	Diff line change
`@@ -2774,10 +2774,11 @@ redis_sock_read_multibulk_multi_reply_loop(INTERNAL_FUNCTION_PARAMETERS,`
`2774`	`2774`	`{`
`2775`	`2775`	`fold_item *fi;`
`2776`	`2776`
`2777`		`- for (fi = redis_sock->head; fi; fi = fi->next) {`
	`2777`	`+ for (fi = redis_sock->head; fi; /* void */) {`
`2778`	`2778`	`if (fi->fun) {`
`2779`	`2779`	`fi->fun(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, z_tab,`
`2780`	`2780`	`fi->ctx TSRMLS_CC);`
	`2781`	`+ fi = fi->next;`
`2781`	`2782`	`continue;`
`2782`	`2783`	`}`
`2783`	`2784`	`size_t len;`
`@@ -2804,6 +2805,7 @@ redis_sock_read_multibulk_multi_reply_loop(INTERNAL_FUNCTION_PARAMETERS,`
`2804`	`2805`	`int num = atol(inbuf + 1);`
`2805`	`2806`	`if (num > 0 && redis_read_multibulk_recursive(redis_sock, num, z_ret TSRMLS_CC) < 0) {`
`2806`	`2807`	`}`
	`2808`	`+ if (fi) fi = fi->next;`
`2807`	`2809`	`}`
`2808`	`2810`	`redis_sock->current = fi;`
`2809`	`2811`	`return 0;`