Merge branch 'hotfix/ra_mget_segfault' into develop

michael-grunder · michael-grunder · commit 2099f1904ad7 · 2013-08-06T14:19:37.000-07:00
diff --git a/redis_array.c b/redis_array.c
@@ -849,7 +849,6 @@ PHP_METHOD(RedisArray, mget)
 
 	/* calls */
 	for(n = 0; n < ra->count; ++n) { /* for each node */
-
 		/* copy args for MGET call on node. */
 		MAKE_STD_ZVAL(z_argarray);
 		array_init(z_argarray);
@@ -873,7 +872,21 @@ PHP_METHOD(RedisArray, mget)
 		zval_ptr_dtor(&z_argarray);
 
 		for(i = 0, j = 0; i < argc; ++i) {
-			if(pos[i] != n) continue;
+		    /* Error out if we didn't get a proper response */
+		    if(Z_TYPE_P(z_ret) != IS_ARRAY) {
+		        /* cleanup */
+		        zval_dtor(z_ret);
+		        efree(z_ret);
+		        zval_ptr_dtor(&z_tmp_array);
+		        efree(pos);
+		        efree(redis_instances);
+		        efree(argc_each);
+
+		        /* failure */
+		        RETURN_FALSE;
+		    }
+
+		    if(pos[i] != n) continue;
 
 			zend_hash_quick_find(Z_ARRVAL_P(z_ret), NULL, 0, j, (void**)&z_cur);
 			j++;
@@ -886,7 +899,6 @@ PHP_METHOD(RedisArray, mget)
 		}
 		zval_dtor(z_ret);
 		efree(z_ret);
-
 	}
 
 	/* copy temp array in the right order to return_value */
