Fix segfault in wrapper error log mechanism when errors are logged on

second and subsequent events.
Implement very simple recursion protection for user streams written
like this:
class urlEncodeStream {
    var $fp = NULL;

    function stream_open($path, $mode, $options, &$opened_path)
    {
        $this->fp = fopen($path, $mode); // <-- this recurses infinitely
        return is_resource($this->fp);
    }
}

file_register_wrapper('urlencode', 'urlEncodeStream');
$fp = fopen('urlencode:///tmp/outputfile.txt', 'w');

Noticed by: Yasuo.

1 files changed, 1 insertions, 0 deletions

diff --git a/ext/standard/file.h b/ext/standard/file.h
index 3990504509..4e5eba55dd 100644
--- a/ext/standard/file.h
+++ b/ext/standard/file.h
@@ -115,6 +115,7 @@ typedef struct {
 	int auto_detect_line_endings;
 	int default_socket_timeout;
 	char *user_agent;
+	char *user_stream_current_filename; /* for simple recursion protection */
 } php_file_globals;
 
 #ifdef ZTS