summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Wallner <mike@php.net>2015-01-30 23:11:33 +0100
committerMichael Wallner <mike@php.net>2015-01-30 23:11:33 +0100
commit130d7320b160443ca160ee6b3a19a034ee2c5ef1 (patch)
tree7b0e26cb61335e9e53a91bb18c54afe2ff5bd58e
parent0d267bdecccca4deee42a9827b47aa555372ef66 (diff)
parent305c03e75782fe39aaa71fc8a8983a8110b13beb (diff)
downloadphp-git-130d7320b160443ca160ee6b3a19a034ee2c5ef1.tar.gz
Merge branch 'incorrect_close' of github.com:MegaManSec/php-src
* 'incorrect_close' of github.com:MegaManSec/php-src: Use correct deallocator in phpdbg
-rw-r--r--sapi/phpdbg/phpdbg_prompt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
index 198020d365..cb03b1a287 100644
--- a/sapi/phpdbg/phpdbg_prompt.c
+++ b/sapi/phpdbg/phpdbg_prompt.c
@@ -876,7 +876,7 @@ PHPDBG_COMMAND(sh) /* {{{ */
FILE *fd = NULL;
if ((fd=VCWD_POPEN((char*)param->str, "w"))) {
/* TODO: do something perhaps ?? do we want input ?? */
- fclose(fd);
+ pclose(fd);
} else {
phpdbg_error("sh", "type=\"failure\" smd=\"%s\"", "Failed to execute %s", param->str);
}