diff options
| author | Rasmus Lerdorf <rasmus@lerdorf.com> | 2015-02-22 08:14:41 -0800 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@lerdorf.com> | 2015-02-22 08:14:41 -0800 |
| commit | e12b72d3f78cc49d33bcf73ad2d4fa09b6aeff84 (patch) | |
| tree | 2d3f932d85571549b71e8dd2ef27a803c9f13ea6 | |
| parent | 98959f62200f558e0cbd902265b4bae8b09aa30f (diff) | |
| download | php-git-e12b72d3f78cc49d33bcf73ad2d4fa09b6aeff84.tar.gz | |
Fix bug #68166
We can't always efree here
php_escape_html_entities can return an interned_empty_string
| -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 a98aff0755..7787ac6488 100644 --- a/main/main.c +++ b/main/main.c @@ -1157,7 +1157,7 @@ static void php_error_cb(int type, const char *error_filename, const uint error_ size_t len; char *buf = php_escape_html_entities(buffer, buffer_len, &len, 0, ENT_COMPAT, NULL TSRMLS_CC); 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, buf, error_filename, error_lineno, STR_PRINT(append_string)); - efree(buf); + str_efree(buf); } else { 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, buffer, error_filename, error_lineno, STR_PRINT(append_string)); } |