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

- Fixed bug #52935 (call exit in user_error_handler cause stream relate core).

Browse Source
This commit is contained in:
Gustavo André dos Santos Lopes 2011-07-05 16:09:06 +00:00
parent 0494615b3c
commit afe4570cda
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/streams/streams.c
View File

@ -163,6 +163,7 @@ void php_stream_display_wrapper_errors(php_stream_wrapper *wrapper, const char *
char *tmp = estrdup(path);
char *msg;
int free_msg = 0;
php_stream_wrapper orig_wrapper;
if (wrapper) {
if (wrapper->err_count > 0) {
@ -207,7 +208,16 @@ void php_stream_display_wrapper_errors(php_stream_wrapper *wrapper, const char *
}
php_strip_url_passwd(tmp);
if (wrapper) {
/* see bug #52935 */
orig_wrapper = *wrapper;
wrapper->err_stack = NULL;
wrapper->err_count = 0;
}
php_error_docref1(NULL TSRMLS_CC, tmp, E_WARNING, "%s: %s", caption, msg);
if (wrapper) {
*wrapper = orig_wrapper;
}
efree(tmp);
if (free_msg) {
efree(msg);