archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 22:48:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

MFB52: Fix Bug #37780 memory leak trying to execute a non existing file (CLI)

Browse source
This commit is contained in:
Michael Wallner 2006-06-19 14:53:03 +00:00
parent 26713e9afe
commit dbfa7271c8
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
sapi/cli/php_cli.c
View file

@ -313,6 +313,14 @@ static char* sapi_cli_read_cookies(TSRMLS_D)
return NULL; return NULL;
} }
static int sapi_cli_header_handler(sapi_header_struct *h, sapi_headers_struct *s TSRMLS_DC)
{
/* free allocated header line */
efree(h->header);
/* avoid pushing headers into SAPI headers list */
return 0;
}
static int sapi_cli_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) static int sapi_cli_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{ {
/* We do nothing here, this function is needed to prevent that the fallback /* We do nothing here, this function is needed to prevent that the fallback
@ -374,7 +382,7 @@ static sapi_module_struct cli_sapi_module = {
php_error, /* error handler */ php_error, /* error handler */
NULL, /* header handler */ sapi_cli_header_handler, /* header handler */
sapi_cli_send_headers, /* send headers handler */ sapi_cli_send_headers, /* send headers handler */
sapi_cli_send_header, /* send header handler */ sapi_cli_send_header, /* send header handler */
@ -1254,6 +1262,7 @@ out_err:
return exit_status; return exit_status;
err: err:
sapi_deactivate(TSRMLS_C);
zend_ini_deactivate(TSRMLS_C); zend_ini_deactivate(TSRMLS_C);
exit_status = 1; exit_status = 1;
goto out_err; goto out_err;