mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix double free in formatted_print.c

Browse Source
This commit is contained in:
Bob Weinand 2015-12-06 02:54:28 +01:00
parent 559ede17e1
commit aa8cac578e
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -27,6 +27,7 @@ PHP NEWS
. Fixed bug #70987 (static::class within Closure::call() causes segfault).
(Andrea)
. Fixed bug #71013 (Incorrect exception handler with yield from). (Bob)
. Fixed double free in error condition of format printer. (Bob)
- CLI server:
. Fixed bug #71005 (Segfault in php_cli_server_dispatch_router()). (Adam)

6
ext/standard/formatted_print.c
View File

@ -518,9 +518,6 @@ php_formatted_print(zend_execute_data *execute_data, int use_array, int format_o
efree(newargs);
}
php_error_docref(NULL, E_WARNING, "Width must be greater than zero and less than %d", INT_MAX);
if (newargs) {
efree(newargs);
}
return NULL;
}
adjusting |= ADJ_WIDTH;
@ -540,9 +537,6 @@ php_formatted_print(zend_execute_data *execute_data, int use_array, int format_o
efree(newargs);
}
php_error_docref(NULL, E_WARNING, "Precision must be greater than zero and less than %d", INT_MAX);
if (newargs) {
efree(newargs);
}
return NULL;
}
adjusting |= ADJ_PRECISION;