From 5ed0602ec622274bf5672304ae414e5ecb2e5167 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 22 Sep 2020 13:01:32 +0200 Subject: Fix #76943: Inconsistent stream_wrapper_restore() errors If restoring of any not registered built-in wrapper is requested, the function is supposed to fail with a warning, so we have to check this condition first. Furthermore, to be able to detect whether a built-in wrapper has been changed, it is not sufficient to check whether *any* userland wrapper has been registered, but rather whether the specific wrapper has been modified. Closes GH-6183. --- main/streams/userspace.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'main') diff --git a/main/streams/userspace.c b/main/streams/userspace.c index 3b513cb7f1..9d15310b16 100644 --- a/main/streams/userspace.c +++ b/main/streams/userspace.c @@ -559,23 +559,24 @@ PHP_FUNCTION(stream_wrapper_restore) { zend_string *protocol; php_stream_wrapper *wrapper; - HashTable *global_wrapper_hash; + HashTable *global_wrapper_hash, *wrapper_hash; if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &protocol) == FAILURE) { RETURN_FALSE; } global_wrapper_hash = php_stream_get_url_stream_wrappers_hash_global(); - if (php_stream_get_url_stream_wrappers_hash() == global_wrapper_hash) { - php_error_docref(NULL, E_NOTICE, "%s:// was never changed, nothing to restore", ZSTR_VAL(protocol)); - RETURN_TRUE; - } - if ((wrapper = zend_hash_find_ptr(global_wrapper_hash, protocol)) == NULL) { php_error_docref(NULL, E_WARNING, "%s:// never existed, nothing to restore", ZSTR_VAL(protocol)); RETURN_FALSE; } + wrapper_hash = php_stream_get_url_stream_wrappers_hash(); + if (wrapper_hash == global_wrapper_hash || zend_hash_find_ptr(wrapper_hash, protocol) == wrapper) { + php_error_docref(NULL, E_NOTICE, "%s:// was never changed, nothing to restore", ZSTR_VAL(protocol)); + RETURN_TRUE; + } + /* A failure here could be okay given that the protocol might have been merely unregistered */ php_unregister_url_stream_wrapper_volatile(protocol); -- cgit v1.2.1