archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix the stat check in stream open

Browse source 
addref to the stream context
This commit is contained in:
Shane Caraveo 2003-10-20 03:11:45 +00:00
parent 24793840b2
commit c55f987230
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
ext/libxml/libxml.c
View file

@ -113,12 +113,24 @@ void *php_libxml_streams_IO_open_wrapper(const char *filename)
int file_exist; int file_exist;
php_stream_statbuf ssbuf; php_stream_statbuf ssbuf;
php_stream_context *context = NULL; php_stream_context *context = NULL;
php_stream_wrapper *wrapper = NULL;
char *path_to_open = NULL;
TSRMLS_FETCH(); TSRMLS_FETCH();
xmlURIUnescapeString(filename, 0, resolved_path); xmlURIUnescapeString(filename, 0, resolved_path);
file_exist = _php_stream_stat_path((char *) resolved_path, &ssbuf TSRMLS_CC); path_to_open = resolved_path;
if (file_exist == -1) {
return NULL; /* logic copied from _php_stream_stat, but we only want to fail
if the wrapper supports stat, otherwise, figure it out from
the open. This logic is only to support hiding warnings
that the streams layer puts out at times, but for libxml we
may try to open files that don't exist, but it is not a failure
in xml processing (eg. DTD files) */
wrapper = php_stream_locate_url_wrapper(resolved_path, &path_to_open, ENFORCE_SAFE_MODE TSRMLS_CC);
if (wrapper && wrapper->wops->url_stat) {
if (wrapper->wops->url_stat(wrapper, path_to_open, &ssbuf TSRMLS_CC) == -1) {
return NULL;
}
} }
if (LIBXML(stream_context)) { if (LIBXML(stream_context)) {
@ -255,6 +267,11 @@ PHP_FUNCTION(libxml_set_streams_context)
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &arg) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &arg) == FAILURE) {
return; return;
} }
if (LIBXML(stream_context)) {
ZVAL_DELREF(LIBXML(stream_context));
LIBXML(stream_context) = NULL;
}
ZVAL_ADDREF(arg);
LIBXML(stream_context) = arg; LIBXML(stream_context) = arg;
} }
/* }}} */ /* }}} */