Duplicate zval before add_next_index_zval

yatsukhnenko · michael-grunder · commit d2f2a7d95e3f · 2022-01-11T11:27:35.000-08:00
diff --git a/redis_array.c b/redis_array.c
@@ -1095,7 +1095,8 @@ ra_generic_del(INTERNAL_FUNCTION_PARAMETERS, char *kw, int kw_len)
         /* copy all elements to z_keys */
         array_init(&z_keys);
         for (i = 0; i < argc; ++i) {
-            add_next_index_zval(&z_keys, &z_args[i]);
+            ZVAL_ZVAL(&z_ret, &z_args[i], 1, 0);
+            add_next_index_zval(&z_keys, &z_ret);
         }
         free_zkeys = 1;
     }
@@ -1144,7 +1145,8 @@ ra_generic_del(INTERNAL_FUNCTION_PARAMETERS, char *kw, int kw_len)
         array_init(&z_argarray);
         for(i = 0; i < argc; ++i) {
             if (pos[i] == n) {
-                add_next_index_zval(&z_argarray, argv[i]);
+                ZVAL_ZVAL(&z_ret, argv[i], 1, 0);
+                add_next_index_zval(&z_argarray, &z_ret);
                 found++;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1095,7 +1095,8 @@ ra_generic_del(INTERNAL_FUNCTION_PARAMETERS, char *kw, int kw_len)`
`1095`	`1095`	`/* copy all elements to z_keys */`
`1096`	`1096`	`array_init(&z_keys);`
`1097`	`1097`	`for (i = 0; i < argc; ++i) {`
`1098`		`- add_next_index_zval(&z_keys, &z_args[i]);`
	`1098`	`+ ZVAL_ZVAL(&z_ret, &z_args[i], 1, 0);`
	`1099`	`+ add_next_index_zval(&z_keys, &z_ret);`
`1099`	`1100`	`}`
`1100`	`1101`	`free_zkeys = 1;`
`1101`	`1102`	`}`
`@@ -1144,7 +1145,8 @@ ra_generic_del(INTERNAL_FUNCTION_PARAMETERS, char *kw, int kw_len)`
`1144`	`1145`	`array_init(&z_argarray);`
`1145`	`1146`	`for(i = 0; i < argc; ++i) {`
`1146`	`1147`	`if (pos[i] == n) {`
`1147`		`- add_next_index_zval(&z_argarray, argv[i]);`
	`1148`	`+ ZVAL_ZVAL(&z_ret, argv[i], 1, 0);`
	`1149`	`+ add_next_index_zval(&z_argarray, &z_ret);`
`1148`	`1150`	`found++;`
`1149`	`1151`	`}`
`1150`	`1152`	`}`