diff options
author | Xinchen Hui <laruence@php.net> | 2012-07-18 20:16:27 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@php.net> | 2012-07-18 20:16:27 +0800 |
commit | 2d9d2cadadf0fdf12a01b4a689d0554e1450904f (patch) | |
tree | 5e9d7b53f875a9943cb6e9352662bafa54c031ed | |
parent | 8f89cfb548a733ec0d8004920be7d2e7e3cfe107 (diff) | |
download | php-git-2d9d2cadadf0fdf12a01b4a689d0554e1450904f.tar.gz |
Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build)
-rw-r--r-- | NEWS | 4 | ||||
-rw-r--r-- | ext/standard/file.c | 1 |
2 files changed, 5 insertions, 0 deletions
@@ -35,6 +35,10 @@ PHP NEWS . Fixed bug #61527 (ArrayIterator gives misleading notice on next() when moved to the end). (reeze.xia@gmail.com) +- Streams: + . Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build). + (Laruence) + ?? ??? 2012, PHP 5.4.5 - Core: diff --git a/ext/standard/file.c b/ext/standard/file.c index 7d01d31350..cce0143fff 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -161,6 +161,7 @@ static void file_globals_ctor(php_file_globals *file_globals_p TSRMLS_DC) FG(pclose_ret) = 0; FG(user_stream_current_filename) = NULL; FG(def_chunk_size) = PHP_SOCK_CHUNK_SIZE; + FG(wrapper_errors) = NULL; } static void file_globals_dtor(php_file_globals *file_globals_p TSRMLS_DC) |