diff options
| author | Nuno Lopes <nlopess@php.net> | 2006-09-16 18:21:53 +0000 |
|---|---|---|
| committer | Nuno Lopes <nlopess@php.net> | 2006-09-16 18:21:53 +0000 |
| commit | 121a317695303d8b74b970b5a970f4d3f392899d (patch) | |
| tree | bafd9f9441fc031270eee6ea182bda4629fe7c4b /ext/xmlreader/php_xmlreader.c | |
| parent | 37a08a329c350511d4738402a626cd5ca9b38c59 (diff) | |
| download | php-git-121a317695303d8b74b970b5a970f4d3f392899d.tar.gz | |
MFB
Diffstat (limited to 'ext/xmlreader/php_xmlreader.c')
| -rw-r--r-- | ext/xmlreader/php_xmlreader.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c index 8b8f3b847a..c41429c597 100644 --- a/ext/xmlreader/php_xmlreader.c +++ b/ext/xmlreader/php_xmlreader.c @@ -259,9 +259,9 @@ char *_xmlreader_get_valid_file_path(char *source, char *resolved_path, int reso file_dest = source; if ((uri->scheme == NULL || isFileUri)) { - /* XXX possible buffer overflow if VCWD_REALPATH does not know size of resolved_path */ - if (! VCWD_REALPATH(source, resolved_path)) { - expand_filepath(source, resolved_path TSRMLS_CC); + if (!VCWD_REALPATH(source, resolved_path) && !expand_filepath(source, resolved_path TSRMLS_CC)) { + xmlFreeURI(uri); + return NULL; } file_dest = resolved_path; } |