Merge branch 'php7' of github.com:phpredis/phpredis into php7

michael-grunder · michael-grunder · commit 0d4b42118c13 · 2016-02-08T09:46:37.000-08:00
diff --git a/library.c b/library.c
@@ -2223,6 +2223,7 @@ redis_read_variant_bulk(RedisSock *redis_sock, int size, zval **z_ret
 		return -1;
 	} else {
 		ZVAL_STRINGL(*z_ret, bulk_resp, size);
+		efree(bulk_resp);
 		return 0;
 	}
 }
diff --git a/redis.c b/redis.c
@@ -3129,7 +3129,7 @@ redis_build_eval_cmd(RedisSock *redis_sock, char **ret, char *keyword,
                 if(key_free) efree(key);
 
                 // Free our temporary arg if we created one
-                if(Z_TYPE(z_tmp) == IS_UNDEF) {
+                if(!Z_ISUNDEF(z_tmp)) {
                     zval_dtor(&z_tmp);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -2223,6 +2223,7 @@ redis_read_variant_bulk(RedisSock redis_sock, int size, zval *z_ret`
`2223`	`2223`	`return -1;`
`2224`	`2224`	`} else {`
`2225`	`2225`	`ZVAL_STRINGL(*z_ret, bulk_resp, size);`
	`2226`	`+ efree(bulk_resp);`
`2226`	`2227`	`return 0;`
`2227`	`2228`	`}`
`2228`	`2229`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3129,7 +3129,7 @@ redis_build_eval_cmd(RedisSock redis_sock, char ret, char keyword,`
`3129`	`3129`	`if(key_free) efree(key);`
`3130`	`3130`
`3131`	`3131`	`// Free our temporary arg if we created one`
`3132`		`- if(Z_TYPE(z_tmp) == IS_UNDEF) {`
	`3132`	`+ if(!Z_ISUNDEF(z_tmp)) {`
`3133`	`3133`	`zval_dtor(&z_tmp);`
`3134`	`3134`	`}`
`3135`	`3135`	`}`