Fixes a memory leak in SCAN, with OPT_SCAN_RETRY enabled.

michael-grunder · michael-grunder · commit ebb354193ad8 · 2014-09-02T12:29:26.000-07:00
When you instruct phpredis to retry the scan command in the event of a non zero iterator but zero elements being returned, it was leaking memory, as it did not free the previous result. Addresses phpredis#501
diff --git a/redis.c b/redis.c
@@ -7229,6 +7229,13 @@ generic_scan_cmd(INTERNAL_FUNCTION_PARAMETERS, REDIS_SCAN_TYPE type) {
      * an updated iterator.
      */
     do {
+        /* Free our previous reply if we're back in the loop.  We know we are
+         * if our return_value is an array. */
+        if(Z_TYPE_P(return_value) == IS_ARRAY) {
+            zval_dtor(return_value);
+            ZVAL_NULL(return_value);
+        }
+
         /* Format our SCAN command */
         cmd_len = redis_build_scan_cmd(&cmd, type, key, key_len, (int)iter,
                                    pattern, pattern_len, count);
