Skip to content

Fix #76943: Inconsistent stream_wrapper_restore() errors #6183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix #76943: Inconsistent stream_wrapper_restore() errors #6183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions ext/standard/tests/streams/bug76943.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
13 changes: 7 additions & 6 deletions main/streams/userspace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down