Merge pull request phpredis#1028 from yatsukhnenko/develop

yatsukhnenko · web-flow · commit 0c351f5d1c5a · 2016-11-21T09:59:13.000+02:00
fix crash on FreeBSD and CentOS
diff --git a/redis_array_impl.c b/redis_array_impl.c
@@ -1147,23 +1147,21 @@ ra_move_key(const char *key, int key_len, zval *z_from, zval *z_to TSRMLS_DC) {
 
 /* callback with the current progress, with hostname and count */
 static void zval_rehash_callback(zend_fcall_info *z_cb, zend_fcall_info_cache *z_cb_cache,
-	const char *hostname, long count TSRMLS_DC) {
+	const char *hostname, long count, zval *z_ret TSRMLS_DC) {
 
     zval z_args[2];
 
     ZVAL_STRING(&z_args[0], hostname);
     ZVAL_LONG(&z_args[1], count);
 
 #if (PHP_MAJOR_VERSION < 7)
-    zval *z_ret = NULL,
-        *z_host = &z_args[0], *z_count = &z_args[1],
+    zval *z_host = &z_args[0], *z_count = &z_args[1],
         **z_args_pp[2] = { &z_host, &z_count };
     z_cb->params = z_args_pp;
     z_cb->retval_ptr_ptr = &z_ret;
 #else
-    zval z_ret;
     z_cb->params = z_args;
-    z_cb->retval = &z_ret;
+    z_cb->retval = z_ret;
 #endif
 	z_cb->param_count = 2;
 	z_cb->no_separation = 0;
@@ -1173,18 +1171,16 @@ static void zval_rehash_callback(zend_fcall_info *z_cb, zend_fcall_info_cache *z
 
 	/* cleanup */
     zval_dtor(&z_args[0]);
-    zval_ptr_dtor(&z_ret);
 }
 
 static void
 ra_rehash_server(RedisArray *ra, zval *z_redis, const char *hostname, zend_bool b_index,
 		zend_fcall_info *z_cb, zend_fcall_info_cache *z_cb_cache TSRMLS_DC) {
 
 	char **keys;
-	int *key_lens;
 	long count, i;
-	int target_pos;
-	zval *z_target;
+	int *key_lens, target_pos;
+	zval *z_target, z_ret;
 
 	/* list all keys */
 	if(b_index) {
@@ -1195,7 +1191,8 @@ ra_rehash_server(RedisArray *ra, zval *z_redis, const char *hostname, zend_bool
 
 	/* callback */
 	if(z_cb && z_cb_cache) {
-		zval_rehash_callback(z_cb, z_cb_cache, hostname, count TSRMLS_CC);
+		zval_rehash_callback(z_cb, z_cb_cache, hostname, count, &z_ret TSRMLS_CC);
+        zval_dtor(&z_ret);
 	}
 
 	/* for each key, redistribute */
