diff options
| author | Anatol Belski <ab@php.net> | 2016-01-05 20:03:05 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-01-05 20:03:05 +0100 |
| commit | 1dc395c8c45a6b5f69eff8319cd8b9a1b0a88894 (patch) | |
| tree | bcb3c6569602dcf0998193a35da787487012ceff | |
| parent | 8d630f7d15fead8a76a96d56c97e5ca2852207b1 (diff) | |
| download | php-git-1dc395c8c45a6b5f69eff8319cd8b9a1b0a88894.tar.gz | |
improve fix for bug #71273
| -rw-r--r-- | main/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/main.c b/main/main.c index bc978d9ae3..77a2f64b40 100644 --- a/main/main.c +++ b/main/main.c @@ -724,7 +724,7 @@ PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int typ if (PG(html_errors)) { replace_buffer = php_escape_html_entities((unsigned char*)buffer, buffer_len, 0, ENT_COMPAT, NULL); /* Retry with substituting invalid chars on fail. */ - if (!replace_buffer) { + 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); } |