diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2012-12-19 23:00:41 -0500 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2012-12-19 23:00:41 -0500 |
| commit | d5fe89670ee76baeb50664f5460991892ee77d8c (patch) | |
| tree | 96170475dfc3f0f7ffe2877850a874df0d766ed3 /main | |
| parent | aa9156d7e077d007c395cec6cad8f5d30e8fa33b (diff) | |
| parent | 180b9e150b71a2ff80b2a0cf89e2e834d18328e3 (diff) | |
| download | php-git-d5fe89670ee76baeb50664f5460991892ee77d8c.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'main')
| -rw-r--r-- | main/streams/userspace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/streams/userspace.c b/main/streams/userspace.c index 3b277160d6..74d9beb025 100644 --- a/main/streams/userspace.c +++ b/main/streams/userspace.c @@ -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; |