Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build)

diff --git a/NEWS b/NEWS
index 280eb1ff15d3048d769241e0ccd816977a453734..34b48d9c1e230b5620a038c5df029c9bb95e31ef 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 7d01d313507e954ccd55cbeea76fe317712cbe7e..cce0143fff8e1e86dfa6e38f988a64323b4300d8 100644 (file)
--- 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)