refactoring (#1155)

yatsukhnenko · web-flow · commit 43e1e0faffce · 2017-04-21T00:30:37.000+03:00
Fix memory leak in `redis_long_response` when LONG_MAX overflow.
Add return -1 in `redis_read_reply_type` when `php_stream_getc` returns EOF.
Code formatting in `PHP_METHOD(Redis, exec)`.
diff --git a/common.h b/common.h
@@ -434,9 +434,9 @@ typedef enum _PUBSUB_TYPE {
 #define REDIS_OPT_PREFIX             2
 #define REDIS_OPT_READ_TIMEOUT       3
 #define REDIS_OPT_SCAN               4
+#define REDIS_OPT_FAILOVER           5
 
 /* cluster options */
-#define REDIS_OPT_FAILOVER               5
 #define REDIS_FAILOVER_NONE              0
 #define REDIS_FAILOVER_ERROR             1
 #define REDIS_FAILOVER_DISTRIBUTE        2
diff --git a/library.c b/library.c
@@ -1153,7 +1153,6 @@ PHP_REDIS_API void redis_long_response(INTERNAL_FUNCTION_PARAMETERS,
             if(ret > LONG_MAX) { /* overflow */
                 add_next_index_stringl(z_tab, response + 1, response_len - 1);
             } else {
-                efree(response);
                 add_next_index_long(z_tab, (long)ret);
             }
         } else {
@@ -1162,16 +1161,15 @@ PHP_REDIS_API void redis_long_response(INTERNAL_FUNCTION_PARAMETERS,
             } else {
                 RETVAL_LONG((long)ret);
             }
-            efree(response);
         }
     } else {
-        efree(response);
         IF_NOT_ATOMIC() {
           add_next_index_null(z_tab);
         } else {
-            RETURN_FALSE;
+            RETVAL_FALSE;
         }
     }
+    efree(response);
 }
 
 /* Helper method to convert [key, value, key, value] into [key => value,
@@ -1614,7 +1612,7 @@ PHP_REDIS_API int redis_sock_disconnect(RedisSock *redis_sock TSRMLS_DC)
             redis_sock->watching = 0;
 
             /* Stil valid? */
-            if(redis_sock->stream && !redis_sock->persistent) {
+            if (!redis_sock->persistent) {
                 php_stream_close(redis_sock->stream);
             }
             redis_sock->stream = NULL;
@@ -2104,6 +2102,7 @@ redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type,
     if((*reply_type = php_stream_getc(redis_sock->stream)) == EOF) {
         zend_throw_exception(redis_exception_ce, "socket error on read socket", 
             0 TSRMLS_CC);
+        return -1;
     }
 
     // If this is a BULK, MULTI BULK, or simply an INTEGER response, we can 
diff --git a/redis.c b/redis.c
@@ -38,10 +38,6 @@
 
 #include "library.h"
 
-#define R_SUB_CALLBACK_CLASS_TYPE 1
-#define R_SUB_CALLBACK_FT_TYPE 2
-#define R_SUB_CLOSURE_TYPE 3
-
 #ifdef PHP_SESSION
 extern ps_module ps_mod_redis;
 extern ps_module ps_mod_redis_cluster;
@@ -2366,7 +2362,7 @@ PHP_METHOD(Redis, exec)
 {
     RedisSock *redis_sock;
     char *cmd;
-    int cmd_len;
+    int cmd_len, ret;
     zval *object;
 
     if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
@@ -2381,19 +2377,15 @@ PHP_METHOD(Redis, exec)
         SOCKET_WRITE_COMMAND(redis_sock, cmd, cmd_len)
         efree(cmd);
 
-        if(redis_sock_read_multibulk_multi_reply(
-           INTERNAL_FUNCTION_PARAM_PASSTHRU,
-           redis_sock) < 0)
-        {
-            zval_dtor(return_value);
-            free_reply_callbacks(redis_sock);
-            redis_sock->mode = ATOMIC;
-            redis_sock->watching = 0;
-            RETURN_FALSE;
-        }
+        ret = redis_sock_read_multibulk_multi_reply(
+            INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock);
         free_reply_callbacks(redis_sock);
         redis_sock->mode = ATOMIC;
         redis_sock->watching = 0;
+        if (ret < 0) {
+            zval_dtor(return_value);
+            RETURN_FALSE;
+        }
     }
 
     IF_PIPELINE() {
diff --git a/redis_array.h b/redis_array.h
@@ -8,8 +8,6 @@
 #endif
 #include "common.h"
 
-void redis_destructor_redis_array(zend_resource * rsrc TSRMLS_DC);
-
 PHP_METHOD(RedisArray, __construct);
 PHP_METHOD(RedisArray, __call);
 PHP_METHOD(RedisArray, _hosts);

Original file line number	Diff line number	Diff line change
`@@ -1153,7 +1153,6 @@ PHP_REDIS_API void redis_long_response(INTERNAL_FUNCTION_PARAMETERS,`
`1153`	`1153`	`if(ret > LONG_MAX) { /* overflow */`
`1154`	`1154`	`add_next_index_stringl(z_tab, response + 1, response_len - 1);`
`1155`	`1155`	`} else {`
`1156`		`- efree(response);`
`1157`	`1156`	`add_next_index_long(z_tab, (long)ret);`
`1158`	`1157`	`}`
`1159`	`1158`	`} else {`
`@@ -1162,16 +1161,15 @@ PHP_REDIS_API void redis_long_response(INTERNAL_FUNCTION_PARAMETERS,`
`1162`	`1161`	`} else {`
`1163`	`1162`	`RETVAL_LONG((long)ret);`
`1164`	`1163`	`}`
`1165`		`- efree(response);`
`1166`	`1164`	`}`
`1167`	`1165`	`} else {`
`1168`		`- efree(response);`
`1169`	`1166`	`IF_NOT_ATOMIC() {`
`1170`	`1167`	`add_next_index_null(z_tab);`
`1171`	`1168`	`} else {`
`1172`		`- RETURN_FALSE;`
	`1169`	`+ RETVAL_FALSE;`
`1173`	`1170`	`}`
`1174`	`1171`	`}`
	`1172`	`+ efree(response);`
`1175`	`1173`	`}`
`1176`	`1174`
`1177`	`1175`	`/* Helper method to convert [key, value, key, value] into [key => value,`
`@@ -1614,7 +1612,7 @@ PHP_REDIS_API int redis_sock_disconnect(RedisSock *redis_sock TSRMLS_DC)`
`1614`	`1612`	`redis_sock->watching = 0;`
`1615`	`1613`
`1616`	`1614`	`/* Stil valid? */`
`1617`		`- if(redis_sock->stream && !redis_sock->persistent) {`
	`1615`	`+ if (!redis_sock->persistent) {`
`1618`	`1616`	`php_stream_close(redis_sock->stream);`
`1619`	`1617`	`}`
`1620`	`1618`	`redis_sock->stream = NULL;`
`@@ -2104,6 +2102,7 @@ redis_read_reply_type(RedisSock redis_sock, REDIS_REPLY_TYPE reply_type,`
`2104`	`2102`	`if((*reply_type = php_stream_getc(redis_sock->stream)) == EOF) {`
`2105`	`2103`	`zend_throw_exception(redis_exception_ce, "socket error on read socket",`
`2106`	`2104`	`0 TSRMLS_CC);`
	`2105`	`+ return -1;`
`2107`	`2106`	`}`
`2108`	`2107`
`2109`	`2108`	`// If this is a BULK, MULTI BULK, or simply an INTEGER response, we can`