archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix bug #74725 (html_errors=1 breaks unhandled exceptions)

Browse source
This commit is contained in:
Andrea Faulds 2017-08-12 01:35:27 +01:00
parent b06f8cb58b
commit b59718bdc4
3 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -5,6 +5,7 @@ PHP NEWS
- Core: - Core:
. Fixed bug #74947 (Segfault in scanner on INF number). (Laruence) . Fixed bug #74947 (Segfault in scanner on INF number). (Laruence)
. Fixed bug #74954 (null deref and segfault in zend_generator_resume()). (Bob) . Fixed bug #74954 (null deref and segfault in zend_generator_resume()). (Bob)
. Fixed bug #74725 (html_errors=1 breaks unhandled exceptions). (Andrea)
- cURL: - cURL:
. Fixed bug #74125 (Fixed finding CURL on systems with multiarch support). . Fixed bug #74125 (Fixed finding CURL on systems with multiarch support).

8
main/main.c
View file

@ -722,10 +722,10 @@ PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int typ
buffer_len = (int)vspprintf(&buffer, 0, format, args); buffer_len = (int)vspprintf(&buffer, 0, format, args);
if (PG(html_errors)) { if (PG(html_errors)) {
replace_buffer = php_escape_html_entities((unsigned char*)buffer, buffer_len, 0, ENT_COMPAT, NULL); replace_buffer = php_escape_html_entities((unsigned char*)buffer, buffer_len, 0, ENT_COMPAT, SG(default_charset));
/* Retry with substituting invalid chars on fail. */ /* Retry with substituting invalid chars on fail. */
if (!replace_buffer || ZSTR_LEN(replace_buffer) < 1) { if (!replace_buffer || ZSTR_LEN(replace_buffer) < 1) {
replace_buffer = php_escape_html_entities((unsigned char*)buffer, buffer_len, 0, ENT_COMPAT | ENT_HTML_SUBSTITUTE_ERRORS, NULL); replace_buffer = php_escape_html_entities((unsigned char*)buffer, buffer_len, 0, ENT_COMPAT | ENT_HTML_SUBSTITUTE_ERRORS, SG(default_charset));
} }
efree(buffer); efree(buffer);
@ -792,7 +792,7 @@ PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int typ
} }
if (PG(html_errors)) { if (PG(html_errors)) {
replace_origin = php_escape_html_entities((unsigned char*)origin, origin_len, 0, ENT_COMPAT, NULL); replace_origin = php_escape_html_entities((unsigned char*)origin, origin_len, 0, ENT_COMPAT, SG(default_charset));
efree(origin); efree(origin);
origin = ZSTR_VAL(replace_origin); origin = ZSTR_VAL(replace_origin);
} }
@ -1106,7 +1106,7 @@ static ZEND_COLD void php_error_cb(int type, const char *error_filename, const u
if (PG(html_errors)) { if (PG(html_errors)) {
if (type == E_ERROR || type == E_PARSE) { if (type == E_ERROR || type == E_PARSE) {
zend_string *buf = php_escape_html_entities((unsigned char*)buffer, buffer_len, 0, ENT_COMPAT, NULL); zend_string *buf = php_escape_html_entities((unsigned char*)buffer, buffer_len, 0, ENT_COMPAT, SG(default_charset));
php_printf("%s<br />\n<b>%s</b>: %s in <b>%s</b> on line <b>%d</b><br />\n%s", STR_PRINT(prepend_string), error_type_str, ZSTR_VAL(buf), error_filename, error_lineno, STR_PRINT(append_string)); php_printf("%s<br />\n<b>%s</b>: %s in <b>%s</b> on line <b>%d</b><br />\n%s", STR_PRINT(prepend_string), error_type_str, ZSTR_VAL(buf), error_filename, error_lineno, STR_PRINT(append_string));
zend_string_free(buf); zend_string_free(buf);
} else { } else {

16
tests/output/bug74725.phpt Normal file
View file

@ -0,0 +1,16 @@
--TEST--
Bug #74725: html_errors=1 breaks unhandled exceptions
--FILE--
<?php
ini_set('display_errors', 1);
ini_set('html_errors', 1);
ini_set('default_charset', "Windows-1251");
throw new Exception("\xF2\xE5\xF1\xF2");
// Note to test reader: this file is in Windows-1251 (vim: `:e ++enc=cp1251`)
?>
--EXPECTF--
<br />
<b>Fatal error</b>: Uncaught Exception: òåñò in %s:5
Stack trace:
#0 {main}
thrown in <b>%s</b> on line <b>5</b><br />