archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.4' into PHP-5.5

Browse source
This commit is contained in:
Rasmus Lerdorf 2012-12-19 23:00:41 -05:00
commit d5fe89670e
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
main/streams/userspace.c
View file

@ -458,7 +458,7 @@ static php_stream *user_wrapper_opendir(php_stream_wrapper *wrapper, char *filen
us->wrapper = uwrap;
us->object = user_stream_create_object(uwrap, context TSRMLS_CC);
if(us == NULL) {
if(us->object == NULL) {
FG(user_stream_current_filename) = NULL;
efree(us);
return NULL;