Merge pull request phpredis#1001 from yatsukhnenko/develop

Fix static analyzer warnings

Author: yatsukhnenko

cluster_library.c

@@ -589,6 +589,9 @@ unsigned short cluster_hash_key_zval(zval *z_key) {
             kptr = "Object";
             klen = sizeof("Object")-1;
             break;
+        default:
+            kptr = "";
+            klen = 0;
     }
 
     // Hash the string representation
@@ -1498,6 +1501,7 @@ PHP_REDIS_API void cluster_bulk_raw_resp(INTERNAL_FUNCTION_PARAMETERS,
             RETURN_FALSE;
         } else {
             add_next_index_bool(c->multi_resp, 0);
+            return;
         }
     }
 

library.c

@@ -836,10 +836,10 @@ PHP_REDIS_API void redis_bulk_double_response(INTERNAL_FUNCTION_PARAMETERS, Redi
     if ((response = redis_sock_read(redis_sock, &response_len TSRMLS_CC)) == NULL) {
         IF_MULTI_OR_PIPELINE() {
             add_next_index_bool(z_tab, 0);
+            return;
         } else {
             RETURN_FALSE;
         }
-        return;
     }
 
     ret = atof(response);
@@ -859,6 +859,7 @@ PHP_REDIS_API void redis_type_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *
     if ((response = redis_sock_read(redis_sock, &response_len TSRMLS_CC)) == NULL) {
         IF_MULTI_OR_PIPELINE() {
             add_next_index_bool(z_tab, 0);
+            return;
         } else {
             RETURN_FALSE;
         }
@@ -1940,7 +1941,7 @@ PHP_REDIS_API int redis_mbulk_reply_assoc(INTERNAL_FUNCTION_PARAMETERS, RedisSoc
 PHP_REDIS_API int redis_sock_write(RedisSock *redis_sock, char *cmd, size_t sz 
                             TSRMLS_DC)
 {
-    if(redis_sock && redis_sock->status == REDIS_SOCK_STATUS_DISCONNECTED) {
+    if (!redis_sock || redis_sock->status == REDIS_SOCK_STATUS_DISCONNECTED) {
         zend_throw_exception(redis_exception_ce, "Connection closed", 
             0 TSRMLS_CC);
         return -1;

redis.c

@@ -2454,9 +2454,8 @@ redis_sock_read_multibulk_multi_reply_loop(INTERNAL_FUNCTION_PARAMETERS,
                                            int numElems)
 {
 
-    fold_item *head = redis_sock->head;
-    fold_item *current = redis_sock->current;
-    for(current = head; current; current = current->next) {
+    fold_item *current;
+    for (current = redis_sock->head; current; current = current->next) {
         fold_this_item(INTERNAL_FUNCTION_PARAM_PASSTHRU, current, redis_sock,
             z_tab);
     }
@@ -2552,7 +2551,7 @@ PHP_REDIS_API void generic_unsubscribe_cmd(INTERNAL_FUNCTION_PARAMETERS,
             if(*cmd) {
                 old_cmd = cmd;
             }
-            cmd_len = spprintf(&cmd, 0, "%s %s", cmd, Z_STRVAL_P(data));
+            spprintf(&cmd, 0, "%s %s", cmd, Z_STRVAL_P(data));
             if(old_cmd) {
                 efree(old_cmd);
             }

redis_array.c

@@ -341,8 +341,7 @@ ra_forward_call(INTERNAL_FUNCTION_PARAMETERS, RedisArray *ra, const char *cmd, i
 
 	zval *zp_tmp, z_tmp;
 	char *key = NULL; /* set to avoid "unused-but-set-variable" */
-	int key_len;
-	int i;
+	int i, key_len = 0;
 	zval *redis_inst;
 	zval z_fun, *z_callargs;
 	HashTable *h_args;

redis_array_impl.c

@@ -1122,7 +1122,7 @@ ra_move_list(const char *key, int key_len, zval *z_from, zval *z_to, long ttl TS
 void
 ra_move_key(const char *key, int key_len, zval *z_from, zval *z_to TSRMLS_DC) {
 
-	long res[2], type, ttl;
+	long res[2] = {0}, type, ttl;
 	zend_bool success = 0;
 	if (ra_get_key_type(z_from, key, key_len, z_from, res TSRMLS_CC)) {
 		type = res[0];
@@ -1224,7 +1224,7 @@ ra_rehash_server(RedisArray *ra, zval *z_redis, const char *hostname, zend_bool
 		/* check that we're not moving to the same node. */
 		z_target = ra_find_node(ra, keys[i], key_lens[i], &target_pos TSRMLS_CC);
 
-		if(strcmp(hostname, ra->hosts[target_pos])) { /* different host */
+		if (z_target && strcmp(hostname, ra->hosts[target_pos])) { /* different host */
 			/* php_printf("move [%s] from [%s] to [%s]\n", keys[i], hostname, ra->hosts[target_pos]); */
 			ra_move_key(keys[i], key_lens[i], z_redis, z_target TSRMLS_CC);
 		}

redis_cluster.c

@@ -1889,7 +1889,7 @@ static void cluster_eval_cmd(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
     zval *z_arr=NULL, *z_ele;
     HashTable *ht_arr;
     long num_keys = 0;
-    short slot;
+    short slot = 0;
     smart_string cmdstr = {0};
 
     /* Parse args */

redis_commands.c

@@ -2986,11 +2986,16 @@ int redis_command_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
     /* Construct our command */
     if(!kw) {
         *cmd_len = redis_cmd_format_static(cmd, "COMMAND", "");
-    } else if(kw && !z_arg) {
+    } else if (!z_arg) {
         /* Sanity check */
-        if(strncasecmp(kw, "info", sizeof("info")-1) ||
-           Z_TYPE_P(z_arg)!=IS_STRING)
-        {
+        if (strncasecmp(kw, "count", sizeof("count") - 1)) {
+            return FAILURE;
+        }
+        /* COMMAND COUNT */
+        *cmd_len = redis_cmd_format_static(cmd, "COMMAND", "s", "COUNT", sizeof("COUNT") - 1);
+    } else if (Z_TYPE_P(z_arg) == IS_STRING) {
+        /* Sanity check */
+        if (strncasecmp(kw, "info", sizeof("info") - 1)) {
             return FAILURE;
         }