diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-22 16:14:03 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-22 16:14:03 +0200 |
| commit | 544dbe8ef91f21846b9b33be1352dd6d2bb43a83 (patch) | |
| tree | 6a6daf7030f99c73a374c1120efdd4f5dfaf1bbb | |
| parent | 35013ac8233b6d868da98761db707f16584dc36e (diff) | |
| parent | ff0f6c26c20b97e47f2bb70f631165e3a8801aac (diff) | |
| download | php-git-544dbe8ef91f21846b9b33be1352dd6d2bb43a83.tar.gz | |
Merge branch 'PHP-7.4' into master
* PHP-7.4:
Fix #76943: Inconsistent stream_wrapper_restore() errors
| -rw-r--r-- | ext/standard/tests/streams/bug76943.phpt | 28 | ||||
| -rw-r--r-- | main/streams/userspace.c | 13 |
2 files changed, 35 insertions, 6 deletions
diff --git a/ext/standard/tests/streams/bug76943.phpt b/ext/standard/tests/streams/bug76943.phpt new file mode 100644 index 0000000000..755c348f86 --- /dev/null +++ b/ext/standard/tests/streams/bug76943.phpt @@ -0,0 +1,28 @@ +--TEST-- +Bug #76943 (Inconsistent stream_wrapper_restore() errors) +--SKIPIF-- +<?php +if (!in_array('phar', stream_get_wrappers())) die('skip phar wrapper not registered'); +?> +--FILE-- +<?php +var_dump(stream_wrapper_restore('foo')); +var_dump(stream_wrapper_restore('phar')); + +stream_wrapper_register('bar', 'stdClass'); + +var_dump(stream_wrapper_restore('foo')); +var_dump(stream_wrapper_restore('phar')); +?> +--EXPECTF-- +Warning: stream_wrapper_restore(): foo:// never existed, nothing to restore in %s on line %d +bool(false) + +Notice: stream_wrapper_restore(): phar:// was never changed, nothing to restore in %s on line %d +bool(true) + +Warning: stream_wrapper_restore(): foo:// never existed, nothing to restore in %s on line %d +bool(false) + +Notice: stream_wrapper_restore(): phar:// was never changed, nothing to restore in %s on line %d +bool(true) diff --git a/main/streams/userspace.c b/main/streams/userspace.c index f6381a0014..0e9059a99e 100644 --- a/main/streams/userspace.c +++ b/main/streams/userspace.c @@ -526,23 +526,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_THROWS(); } 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); |