Fix some static analyzer warnings

yatsukhnenko · yatsukhnenko · commit 735025d700d2 · 2017-07-19T15:13:33.000+03:00
Two types of warnings were fixed in this commit:
1. The left operand of '&lt;=' is a garbage value
2. Function call argument is an uninitialized value
diff --git a/cluster_library.c b/cluster_library.c
@@ -2074,6 +2074,7 @@ PHP_REDIS_API void cluster_client_list_resp(INTERNAL_FUNCTION_PARAMETERS, redisC
 PHP_REDIS_API zval *cluster_zval_mbulk_resp(INTERNAL_FUNCTION_PARAMETERS,
                                      redisCluster *c, int pull, mbulk_cb cb, zval *z_ret)
 {
+    ZVAL_NULL(z_ret);
     // Pull our next response if directed
     if(pull) {
         if(cluster_check_response(c, &c->reply_type TSRMLS_CC)<0)
diff --git a/library.c b/library.c
@@ -430,6 +430,7 @@ redis_sock_read_multibulk_reply_zval(INTERNAL_FUNCTION_PARAMETERS,
     int numElems;
     size_t len;
 
+    ZVAL_NULL(z_tab);
     if (redis_sock_gets(redis_sock, inbuf, sizeof(inbuf) - 1, &len TSRMLS_CC) < 0) {
         return NULL;
     }
@@ -1787,6 +1788,8 @@ redis_serialize(RedisSock *redis_sock, zval *z, char **val, strlen_t *val_len
     uint8_t *val8;
 #endif
 
+    *val = NULL;
+    *val_len = 0;
     switch(redis_sock->serializer) {
         case REDIS_SERIALIZER_NONE:
             switch(Z_TYPE_P(z)) {
@@ -1977,6 +1980,7 @@ redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type,
     // Make sure we haven't lost the connection, even trying to reconnect
     if(-1 == redis_check_eof(redis_sock, 0 TSRMLS_CC)) {
         // Failure
+        *reply_type = EOF;
         return -1;
     }
 
diff --git a/redis_array_impl.c b/redis_array_impl.c
@@ -300,7 +300,7 @@ RedisArray *ra_load_array(const char *name TSRMLS_DC) {
     }
 
     /* find read timeout option */
-	array_init(&z_params_connect_timeout);
+	array_init(&z_params_read_timeout);
     if ((iptr = INI_STR("redis.arrays.readtimeout")) != NULL) {
         sapi_module.treat_data(PARSE_STRING, estrdup(iptr), &z_params_read_timeout TSRMLS_CC);
     }

Original file line number	Diff line number	Diff line change
`@@ -2074,6 +2074,7 @@ PHP_REDIS_API void cluster_client_list_resp(INTERNAL_FUNCTION_PARAMETERS, redisC`
`2074`	`2074`	`PHP_REDIS_API zval *cluster_zval_mbulk_resp(INTERNAL_FUNCTION_PARAMETERS,`
`2075`	`2075`	`redisCluster c, int pull, mbulk_cb cb, zval z_ret)`
`2076`	`2076`	`{`
	`2077`	`+ ZVAL_NULL(z_ret);`
`2077`	`2078`	`// Pull our next response if directed`
`2078`	`2079`	`if(pull) {`
`2079`	`2080`	`if(cluster_check_response(c, &c->reply_type TSRMLS_CC)<0)`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ RedisArray ra_load_array(const char name TSRMLS_DC) {`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`/* find read timeout option */`
`303`		`- array_init(&z_params_connect_timeout);`
	`303`	`+ array_init(&z_params_read_timeout);`
`304`	`304`	`if ((iptr = INI_STR("redis.arrays.readtimeout")) != NULL) {`
`305`	`305`	`sapi_module.treat_data(PARSE_STRING, estrdup(iptr), &z_params_read_timeout TSRMLS_CC);`
`306`	`306`	`}`