Fix RPOP to unserialize/decompress data.

michael-grunder · michael-grunder · commit 02c91d59cb9c · 2023-02-24T12:01:43.000-08:00
Fixes #2329
diff --git a/cluster_library.c b/cluster_library.c
@@ -1767,7 +1767,7 @@ cluster_pop_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c, void *ctx)
     if (ctx == NULL) {
         cluster_bulk_resp(INTERNAL_FUNCTION_PARAM_PASSTHRU, c, NULL);
     } else if (ctx == PHPREDIS_CTX_PTR) {
-        cluster_mbulk_raw_resp(INTERNAL_FUNCTION_PARAM_PASSTHRU, c, NULL);
+        cluster_mbulk_resp(INTERNAL_FUNCTION_PARAM_PASSTHRU, c, NULL);
     } else {
         ZEND_ASSERT(!"memory corruption?");
     }
diff --git a/library.c b/library.c
@@ -1488,7 +1488,7 @@ redis_pop_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_
     if (ctx == NULL) {
         return redis_string_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, z_tab, NULL);
     } else if (ctx == PHPREDIS_CTX_PTR) {
-        return redis_mbulk_reply_raw(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, z_tab, NULL);
+        return redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, z_tab, NULL);
     } else {
         ZEND_ASSERT(!"memory corruption?");
         return FAILURE;
diff --git a/tests/RedisTest.php b/tests/RedisTest.php
@@ -1137,18 +1137,13 @@ public function testlPop()
     // PUSH, POP : RPUSH, RPOP
     public function testrPop()
     {
-    //  rpush  => tail
-    //  lpush => head
-
         $this->redis->del('list');
 
         $this->redis->rPush('list', 'val');
         $this->redis->rPush('list', 'val2');
-    $this->redis->lPush('list', 'val3');
-
-    // 'list' = [ 'val3', 'val', 'val2']
+        $this->redis->lPush('list', 'val3');
 
-    $this->assertEquals('val2', $this->redis->rPop('list'));
+        $this->assertEquals('val2', $this->redis->rPop('list'));
         if (version_compare($this->version, "6.2.0") < 0) {
             $this->assertEquals('val', $this->redis->rPop('list'));
             $this->assertEquals('val3', $this->redis->rPop('list'));
@@ -1157,17 +1152,29 @@ public function testrPop()
         }
         $this->assertEquals(FALSE, $this->redis->rPop('list'));
 
-    // testing binary data
 
-    $this->redis->del('list');
-    $this->assertEquals(1, $this->redis->rPush('list', gzcompress('val1')));
-    $this->assertEquals(2, $this->redis->rPush('list', gzcompress('val2')));
-    $this->assertEquals(3, $this->redis->rPush('list', gzcompress('val3')));
+        $this->redis->del('list');
+        $this->assertEquals(1, $this->redis->rPush('list', gzcompress('val1')));
+        $this->assertEquals(2, $this->redis->rPush('list', gzcompress('val2')));
+        $this->assertEquals(3, $this->redis->rPush('list', gzcompress('val3')));
+
+        $this->assertEquals('val3', gzuncompress($this->redis->rPop('list')));
+        $this->assertEquals('val2', gzuncompress($this->redis->rPop('list')));
+        $this->assertEquals('val1', gzuncompress($this->redis->rPop('list')));
+    }
 
-    $this->assertEquals('val3', gzuncompress($this->redis->rPop('list')));
-    $this->assertEquals('val2', gzuncompress($this->redis->rPop('list')));
-    $this->assertEquals('val1', gzuncompress($this->redis->rPop('list')));
+    /* Regression test for GH #2329 */
+    public function testrPopSerialization() {
+        $this->redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_PHP);
 
+        $this->redis->del('rpopkey');
+        $this->redis->rpush('rpopkey', ['foo'], ['bar']);
+        $this->assertEquals([['bar'], ['foo']], $this->redis->rpop('rpopkey', 2));
+
+        $this->redis->rpush('rpopkey', ['foo'], ['bar']);
+        $this->assertEquals([['foo'], ['bar']], $this->redis->lpop('rpopkey', 2));
+
+        $this->redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_NONE);
     }
 
     public function testblockingPop() {

Original file line number	Diff line number	Diff line change
`@@ -1767,7 +1767,7 @@ cluster_pop_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster c, void ctx)`
`1767`	`1767`	`if (ctx == NULL) {`
`1768`	`1768`	`cluster_bulk_resp(INTERNAL_FUNCTION_PARAM_PASSTHRU, c, NULL);`
`1769`	`1769`	`} else if (ctx == PHPREDIS_CTX_PTR) {`
`1770`		`- cluster_mbulk_raw_resp(INTERNAL_FUNCTION_PARAM_PASSTHRU, c, NULL);`
	`1770`	`+ cluster_mbulk_resp(INTERNAL_FUNCTION_PARAM_PASSTHRU, c, NULL);`
`1771`	`1771`	`} else {`
`1772`	`1772`	`ZEND_ASSERT(!"memory corruption?");`
`1773`	`1773`	`}`