Bugfix with MGET in multi/exec mode.

nicolasff · nicolasff · commit a35396e66f1d · 2010-12-14T16:33:50.000+01:00
diff --git a/library.c b/library.c
@@ -860,11 +860,11 @@ PHPAPI int redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSo
 
     IF_MULTI_OR_PIPELINE() {
         add_next_index_zval(z_tab, z_multi_result);
+    } else {
+        *return_value = *z_multi_result;
+        efree(z_multi_result);
     }
-
-    *return_value = *z_multi_result;
     //zval_copy_ctor(return_value);
-    efree(z_multi_result);
     return 0;
 }
 
diff --git a/tests/TestRedis.php b/tests/TestRedis.php
@@ -537,7 +537,7 @@ public function testrPop()
 
 	public function testblockingPop() {
 
-		/* non blocking blPop, brPop */
+	// non blocking blPop, brPop
         $this->redis->delete('list');
         $this->redis->lPush('list', 'val1');
         $this->redis->lPush('list', 'val2');
@@ -550,7 +550,7 @@ public function testblockingPop() {
 		$this->assertTrue($this->redis->brPop(array('list'), 2) === array('list', 'val1'));
 		$this->assertTrue($this->redis->brPop(array('list'), 2) === array('list', 'val2'));
 
-		/* blocking blpop, brpop */
+	// blocking blpop, brpop
         $this->redis->delete('list');
 		$this->assertTrue($this->redis->blPop(array('list'), 2) === array());
 		$this->assertTrue($this->redis->brPop(array('list'), 2) === array());
@@ -1905,6 +1905,7 @@ protected function sequence($mode) {
 	    $this->assertTrue($ret == array());
 
 	    // ttl, mget, mset, msetnx, expire, expireAt
+	    $this->redis->delete('key');
 	    $ret = $this->redis->multi($mode)
 		    ->ttl('key')
 		    ->mget(array('key1', 'key2', 'key3'))

Original file line number	Diff line number	Diff line change
`@@ -860,11 +860,11 @@ PHPAPI int redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSo`
`860`	`860`
`861`	`861`	`IF_MULTI_OR_PIPELINE() {`
`862`	`862`	`add_next_index_zval(z_tab, z_multi_result);`
	`863`	`+ } else {`
	`864`	`+ return_value = z_multi_result;`
	`865`	`+ efree(z_multi_result);`
`863`	`866`	`}`
`864`		`-`
`865`		`- return_value = z_multi_result;`
`866`	`867`	`//zval_copy_ctor(return_value);`
`867`		`- efree(z_multi_result);`
`868`	`868`	`return 0;`
`869`	`869`	`}`
`870`	`870`