clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-27 04:47:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

increase context refcount before open() to avoid crash when open() fails and destroys the context

Browse Source
This commit is contained in:
Antony Dovgal 2008-08-06 09:03:36 +00:00
parent 2c8333b3d6
commit 35f366273f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main/streams/streams.c
View File

@ -2414,14 +2414,22 @@ PHPAPI php_stream *_php_stream_open_wrapper_ex(char *path, char *mode, int optio
php_stream_wrapper_log_error(wrapper, options ^ REPORT_ERRORS TSRMLS_CC, php_stream_wrapper_log_error(wrapper, options ^ REPORT_ERRORS TSRMLS_CC,
"wrapper does not support stream open"); "wrapper does not support stream open");
} else { } else {
/* refcount++ to make sure the context doesn't get destroyed
* if open() fails and stream is closed */
if (context) {
zend_list_addref(context->rsrc_id);
}
stream = wrapper->wops->stream_opener(wrapper, stream = wrapper->wops->stream_opener(wrapper,
path_to_open, implicit_mode, options ^ REPORT_ERRORS, path_to_open, implicit_mode, options ^ REPORT_ERRORS,
opened_path, context STREAMS_REL_CC TSRMLS_CC); opened_path, context STREAMS_REL_CC TSRMLS_CC);
}
/* increase context refcount only if the context is really used */ /* if open() succeeded and context was not used, do refcount--
if (stream && stream->context) { * XXX if a wrapper didn't actually use context (no way to know that)
zend_list_addref(stream->context->rsrc_id); * and open() failed, refcount will stay increased */
if (context && stream && !stream->context) {
zend_list_delete(context->rsrc_id);
}
} }
/* if the caller asked for a persistent stream but the wrapper did not /* if the caller asked for a persistent stream but the wrapper did not