Fixed stream handler override

diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index 7c465618be72a3fa39828a2d3ce9a39f3b460a9d..0bb54a0b69819d527a2f35f52f8f0ce4b7761e28 100644 (file)
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -1356,7 +1356,7 @@ php_stream *phpdbg_stream_url_wrap_php(php_stream_wrapper *wrapper, const char *
                return stream;
        }
 
-       return PHPDBG_G(orig_url_wrap_php)->stream_opener(wrapper, path, mode, options, opened_path, context STREAMS_CC);
+       return PHPDBG_G(orig_url_wrap_php)->wops->stream_opener(wrapper, path, mode, options, opened_path, context STREAMS_CC);
 } /* }}} */
 
 int main(int argc, char **argv) /* {{{ */
@@ -1399,6 +1399,7 @@ int main(int argc, char **argv) /* {{{ */
        void* (*_malloc)(size_t);
        void (*_free)(void*);
        void* (*_realloc)(void*, size_t);
+       php_stream_wrapper wrapper;
        php_stream_wrapper_ops wops;
 
 
@@ -1868,11 +1869,14 @@ phpdbg_main:
                }
 
                {
-                       php_stream_wrapper *wrapper = zend_hash_str_find_ptr(php_stream_get_url_stream_wrappers_hash(), ZEND_STRL("php"));
-                       PHPDBG_G(orig_url_wrap_php) = wrapper->wops;
-                       memcpy(&wops, wrapper->wops, sizeof(wops));
+                       zval *zv = zend_hash_str_find(php_stream_get_url_stream_wrappers_hash(), ZEND_STRL("php"));
+                       php_stream_wrapper *tmp_wrapper = Z_PTR_P(zv);
+                       PHPDBG_G(orig_url_wrap_php) = tmp_wrapper;
+                       memcpy(&wrapper, tmp_wrapper, sizeof(wrapper));
+                       memcpy(&wops, tmp_wrapper->wops, sizeof(wops));
                        wops.stream_opener = phpdbg_stream_url_wrap_php;
-                       wrapper->wops = &wops;
+                       wrapper.wops = (const php_stream_wrapper_ops*)&wops;
+                       Z_PTR_P(zv) = &wrapper;
                }
 
                /* Make stdin, stdout and stderr accessible from PHP scripts */
@@ -2151,8 +2155,8 @@ phpdbg_out:
                }
 
                {
-                       php_stream_wrapper *wrapper = zend_hash_str_find_ptr(php_stream_get_url_stream_wrappers_hash(), ZEND_STRL("php"));
-                       wrapper->wops = PHPDBG_G(orig_url_wrap_php);
+                       zval *zv = zend_hash_str_find(php_stream_get_url_stream_wrappers_hash(), ZEND_STRL("php"));
+                       Z_PTR_P(zv) = (void*)PHPDBG_G(orig_url_wrap_php);
                }
 
                zend_hash_destroy(&PHPDBG_G(file_sources));

diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h
index 0975ec8de2b54266facff300d16419ee73a4f4cc..be7a91c4ca1097faebf753bb9b158de0a2ddbb9f 100644 (file)
--- a/sapi/phpdbg/phpdbg.h
+++ b/sapi/phpdbg/phpdbg.h
@@ -308,7 +308,7 @@ ZEND_BEGIN_MODULE_GLOBALS(phpdbg)
        zend_bool last_was_newline;                  /* check if we don't need to output a newline upon next phpdbg_error or phpdbg_notice */
 
        FILE *stdin_file;                            /* FILE pointer to stdin source file */
-       const php_stream_wrapper_ops *orig_url_wrap_php;
+       const php_stream_wrapper *orig_url_wrap_php;
 
        char input_buffer[PHPDBG_MAX_CMD];           /* stdin input buffer */
        int input_buflen;                            /* length of stdin input buffer */