SmallEasy
diff --git a/‎common.h‎
Lines changed: 15 additions & 2 deletions b/‎common.h‎
Lines changed: 15 additions & 2 deletions
diff --git a/‎library.c‎
Lines changed: 3 additions & 3 deletions b/‎library.c‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎redis_array.c‎
Lines changed: 24 additions & 11 deletions b/‎redis_array.c‎
Lines changed: 24 additions & 11 deletions
@@ -170,12 +170,25 @@ typedef zend_rsrc_list_entry zend_resource;
 static int (*_add_next_index_stringl)(zval *, const char *, uint, int) = &add_next_index_stringl;
 #define add_next_index_stringl(arg, str, length) _add_next_index_stringl(arg, str, length, 1);
 
+#undef ZVAL_STRING
+#define ZVAL_STRING(z, s) do { \
+    const char *_s=(s); \
+    ZVAL_STRINGL(z, _s, strlen(_s)); \
+} while (0)
 #undef RETVAL_STRING
-#define RETVAL_STRING(s) ZVAL_STRING(return_value, s, 1)
+#define RETVAL_STRING(s) ZVAL_STRING(return_value, s)
 #undef RETURN_STRING
 #define RETURN_STRING(s) { RETVAL_STRING(s); return; }
+#undef ZVAL_STRINGL
+#define ZVAL_STRINGL(z, s, l) do { \
+    const char *__s=(s); int __l=l; \
+    zval *__z = (z); \
+    Z_STRLEN_P(__z) = __l; \
+    Z_STRVAL_P(__z) = estrndup(__s, __l); \
+    Z_TYPE_P(__z) = IS_STRING; \
+} while(0)
 #undef RETVAL_STRINGL
-#define RETVAL_STRINGL(s, l) ZVAL_STRINGL(return_value, s, l, 1)
+#define RETVAL_STRINGL(s, l) ZVAL_STRINGL(return_value, s, l)
 #undef RETURN_STRINGL
 #define RETURN_STRINGL(s, l) { RETVAL_STRINGL(s, l); return; }
 
 
@@ -2286,10 +2286,10 @@ redis_read_variant_bulk(RedisSock *redis_sock, int size, zval **z_ret
 	if(bulk_resp == NULL) {
 		ZVAL_FALSE(*z_ret);
 		return -1;
-	} else {
-		ZVAL_STRINGL(*z_ret, bulk_resp, size, 0);
-		return 0;
 	}
+    ZVAL_STRINGL(*z_ret, bulk_resp, size);
+    efree(bulk_resp);
+    return 0;
 }
 
 PHP_REDIS_API int
 
@@ -377,7 +377,7 @@ ra_forward_call(INTERNAL_FUNCTION_PARAMETERS, RedisArray *ra, const char *cmd, i
 	}
 
 	/* pass call through */
-	ZVAL_STRING(&z_fun, cmd, 0);	/* method name */
+	ZVAL_STRING(&z_fun, cmd);	/* method name */
 	z_callargs = ecalloc(argc + 1, sizeof(zval));
 
 	/* copy args to array */
@@ -391,6 +391,7 @@ ra_forward_call(INTERNAL_FUNCTION_PARAMETERS, RedisArray *ra, const char *cmd, i
 	/* multi/exec */
 	if(ra->z_multi_exec) {
 		call_user_function(&redis_ce->function_table, ra->z_multi_exec, &z_fun, return_value, argc, z_callargs);
+        zval_dtor(&z_fun);
 		efree(z_callargs);
 		RETURN_ZVAL(getThis(), 1, 0);
 	}
@@ -425,6 +426,7 @@ ra_forward_call(INTERNAL_FUNCTION_PARAMETERS, RedisArray *ra, const char *cmd, i
 	}
 
 	/* cleanup */
+    zval_dtor(&z_fun);
 	efree(z_callargs);
 }
 
@@ -603,7 +605,7 @@ static void multihost_distribute(INTERNAL_FUNCTION_PARAMETERS, const char *metho
 	}
 
 	/* prepare call */
-	ZVAL_STRING(&z_fun, method_name, 0);
+	ZVAL_STRING(&z_fun, method_name);
 
 	array_init(return_value);
 	for(i = 0; i < ra->count; ++i) {
@@ -615,6 +617,7 @@ static void multihost_distribute(INTERNAL_FUNCTION_PARAMETERS, const char *metho
 
 		add_assoc_zval(return_value, ra->hosts[i], z_tmp);
 	}
+    zval_dtor(&z_fun);
 }
 
 PHP_METHOD(RedisArray, info)
@@ -668,10 +671,10 @@ PHP_METHOD(RedisArray, keys)
 	}
 
 	/* Set up our function call (KEYS) */
-	ZVAL_STRINGL(&z_fun, "KEYS", 4, 0);
+	ZVAL_STRINGL(&z_fun, "KEYS", 4);
 
 	/* We will be passing with one string argument (the pattern) */
-	ZVAL_STRINGL(z_args, pattern, pattern_len, 0);
+	ZVAL_STRINGL(z_args, pattern, pattern_len);
 
 	/* Init our array return */
 	array_init(return_value);
@@ -687,6 +690,8 @@ PHP_METHOD(RedisArray, keys)
 		/* Add the result for this host */
 		add_assoc_zval(return_value, ra->hosts[i], z_tmp);
 	}
+    zval_dtor(&z_args[0]);
+    zval_dtor(&z_fun);
 }
 
 PHP_METHOD(RedisArray, getOption)
@@ -706,7 +711,7 @@ PHP_METHOD(RedisArray, getOption)
 	}
 
 	/* prepare call */
-	ZVAL_STRINGL(&z_fun, "getOption", 9, 0);
+	ZVAL_STRINGL(&z_fun, "getOption", 9);
 
 	/* copy arg */
 	ZVAL_LONG(&z_args[0], opt);
@@ -721,6 +726,7 @@ PHP_METHOD(RedisArray, getOption)
 
 		add_assoc_zval(return_value, ra->hosts[i], z_tmp);
 	}
+    zval_dtor(&z_fun);
 }
 
 PHP_METHOD(RedisArray, setOption)
@@ -742,11 +748,11 @@ PHP_METHOD(RedisArray, setOption)
 	}
 
 	/* prepare call */
-	ZVAL_STRINGL(&z_fun, "setOption", 9, 0);
+	ZVAL_STRINGL(&z_fun, "setOption", 9);
 
 	/* copy args */
 	ZVAL_LONG(&z_args[0], opt);
-	ZVAL_STRINGL(&z_args[1], val_str, val_len, 0);
+	ZVAL_STRINGL(&z_args[1], val_str, val_len);
 
 	array_init(return_value);
 	for(i = 0; i < ra->count; ++i) {
@@ -758,6 +764,8 @@ PHP_METHOD(RedisArray, setOption)
 
 		add_assoc_zval(return_value, ra->hosts[i], z_tmp);
 	}
+    zval_dtor(&z_args[1]);
+    zval_dtor(&z_fun);
 }
 
 PHP_METHOD(RedisArray, select)
@@ -777,7 +785,7 @@ PHP_METHOD(RedisArray, select)
 	}
 
 	/* prepare call */
-	ZVAL_STRINGL(&z_fun, "select", 6,  0);
+	ZVAL_STRINGL(&z_fun, "select", 6);
 
 	/* copy args */
     ZVAL_LONG(&z_args[0], opt);
@@ -791,6 +799,7 @@ PHP_METHOD(RedisArray, select)
 
 		add_assoc_zval(return_value, ra->hosts[i], z_tmp);
 	}
+    zval_dtor(&z_fun);
 }
 
 #define HANDLE_MULTI_EXEC(cmd) do {\
@@ -845,7 +854,7 @@ PHP_METHOD(RedisArray, mget)
 	}
 
 	/* prepare call */
-	ZVAL_STRINGL(&z_fun, "MGET", 4, 0);
+	ZVAL_STRINGL(&z_fun, "MGET", 4);
 
 	/* init data structures */
 	h_keys = Z_ARRVAL_P(z_keys);
@@ -928,6 +937,7 @@ PHP_METHOD(RedisArray, mget)
 		        zval_dtor(z_ret);
 		        efree(z_ret);
 		        zval_ptr_dtor(&z_tmp_array);
+                zval_dtor(&z_fun);
 		        efree(pos);
 		        efree(argc_each);
 
@@ -962,6 +972,7 @@ PHP_METHOD(RedisArray, mget)
 
 	/* cleanup */
 	zval_ptr_dtor(&z_tmp_array);
+    zval_dtor(&z_fun);
 	efree(argv);
 	efree(pos);
 	efree(argc_each);
@@ -1057,7 +1068,7 @@ PHP_METHOD(RedisArray, mset)
 		}
 
         /* prepare call */
-        ZVAL_STRINGL(&z_fun, "MSET", 4, 0);
+        ZVAL_STRINGL(&z_fun, "MSET", 4);
         redis_inst = &ra->redis[n];
 		if(ra->index) { /* add MULTI */
 			ra_index_multi(redis_inst, MULTI TSRMLS_CC);
@@ -1071,6 +1082,7 @@ PHP_METHOD(RedisArray, mset)
 			ra_index_exec(redis_inst, NULL, 0 TSRMLS_CC); /* run EXEC */
 		}
 
+		zval_dtor(&z_fun);
 		zval_dtor(&z_ret);
 
 		zval_ptr_dtor(&z_argarray);
@@ -1138,7 +1150,7 @@ PHP_METHOD(RedisArray, del)
 	}
 
 	/* prepare call */
-	ZVAL_STRINGL(&z_fun, "DEL", 3, 0);
+	ZVAL_STRINGL(&z_fun, "DEL", 3);
 
 	/* init data structures */
 	h_keys = Z_ARRVAL_P(z_keys);
@@ -1216,6 +1228,7 @@ PHP_METHOD(RedisArray, del)
 	}
 
 	/* cleanup */
+	zval_dtor(&z_fun);
 	efree(argv);
 	efree(pos);
 	efree(argc_each);
Original file line number	Diff line number	Diff line change
`@@ -2286,10 +2286,10 @@ redis_read_variant_bulk(RedisSock redis_sock, int size, zval *z_ret`
`2286`	`2286`	`if(bulk_resp == NULL) {`
`2287`	`2287`	`ZVAL_FALSE(*z_ret);`
`2288`	`2288`	`return -1;`
`2289`		`- } else {`
`2290`		`- ZVAL_STRINGL(*z_ret, bulk_resp, size, 0);`
`2291`		`- return 0;`
`2292`	`2289`	`}`
	`2290`	`+ ZVAL_STRINGL(*z_ret, bulk_resp, size);`
	`2291`	`+ efree(bulk_resp);`
	`2292`	`+ return 0;`
`2293`	`2293`	`}`
`2294`	`2294`
`2295`	`2295`	`PHP_REDIS_API int`