Fixed memory leak inside readline_callback_handler_install() function

Ilia Alshanetsky · Ilia Alshanetsky · commit 4907faecd126 · 2008-11-16T18:00:50.000Z
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
@@ -187,7 +187,7 @@ PHP_RSHUTDOWN_FUNCTION(readline)
 #if HAVE_RL_CALLBACK_READ_CHAR
 	if (_prepped_callback) {
 		rl_callback_handler_remove();
-		FREE_ZVAL(_prepped_callback);
+		zval_ptr_dtor(&_prepped_callback);
 		_prepped_callback = 0;
 	}
 #endif
@@ -556,10 +556,11 @@ PHP_FUNCTION(readline_callback_handler_install)
 		efree(name);
 		RETURN_FALSE;
 	}
+	efree(name);
 
 	if (_prepped_callback) {
 		rl_callback_handler_remove();
-		FREE_ZVAL(_prepped_callback);
+		zval_ptr_dtor(&_prepped_callback);
 	}
 
 	MAKE_STD_ZVAL(_prepped_callback);

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ PHP_RSHUTDOWN_FUNCTION(readline)`
`187`	`187`	`#if HAVE_RL_CALLBACK_READ_CHAR`
`188`	`188`	`if (_prepped_callback) {`
`189`	`189`	`rl_callback_handler_remove();`
`190`		`- FREE_ZVAL(_prepped_callback);`
	`190`	`+ zval_ptr_dtor(&_prepped_callback);`
`191`	`191`	`_prepped_callback = 0;`
`192`	`192`	`}`
`193`	`193`	`#endif`
`@@ -556,10 +556,11 @@ PHP_FUNCTION(readline_callback_handler_install)`
`556`	`556`	`efree(name);`
`557`	`557`	`RETURN_FALSE;`
`558`	`558`	`}`
	`559`	`+ efree(name);`
`559`	`560`
`560`	`561`	`if (_prepped_callback) {`
`561`	`562`	`rl_callback_handler_remove();`
`562`		`- FREE_ZVAL(_prepped_callback);`
	`563`	`+ zval_ptr_dtor(&_prepped_callback);`
`563`	`564`	`}`
`564`	`565`
`565`	`566`	`MAKE_STD_ZVAL(_prepped_callback);`