Don't try and efree a non allocated variable

michael-grunder · michael-grunder · commit fc673f59c999 · 2015-08-03T21:21:19.000-07:00
Addresses phpredis#638
diff --git a/redis.c b/redis.c
@@ -5621,10 +5621,9 @@ PHP_REDIS_API void generic_subscribe_cmd(INTERNAL_FUNCTION_PARAMETERS, char *sub
 	}
 
 	if (zend_hash_index_find(Z_ARRVAL_P(z_tab), 0, (void**)&tmp) == SUCCESS) {
-		type_response = Z_STRVAL_PP(tmp);
+        type_response = Z_STRVAL_PP(tmp);
 		if(strcmp(type_response, sub_cmd) != 0) {
-            efree(tmp);
-			zval_dtor(z_tab);
+            zval_dtor(z_tab);
             efree(z_tab);
 			RETURN_FALSE;
 		}

Original file line number	Diff line number	Diff line change
`@@ -5621,10 +5621,9 @@ PHP_REDIS_API void generic_subscribe_cmd(INTERNAL_FUNCTION_PARAMETERS, char *sub`
`5621`	`5621`	`}`
`5622`	`5622`
`5623`	`5623`	`if (zend_hash_index_find(Z_ARRVAL_P(z_tab), 0, (void**)&tmp) == SUCCESS) {`
`5624`		`- type_response = Z_STRVAL_PP(tmp);`
	`5624`	`+ type_response = Z_STRVAL_PP(tmp);`
`5625`	`5625`	`if(strcmp(type_response, sub_cmd) != 0) {`
`5626`		`- efree(tmp);`
`5627`		`- zval_dtor(z_tab);`
	`5626`	`+ zval_dtor(z_tab);`
`5628`	`5627`	`efree(z_tab);`
`5629`	`5628`	`RETURN_FALSE;`
`5630`	`5629`	`}`