iliaa Sat Sep 16 19:08:59 2006 UTC Modified files: /php-src/ext/dom document.c Log: MFB: One last expand_filepath() check http://cvs.php.net/viewvc.cgi/php-src/ext/dom/document.c?r1=1.79&r2=1.80&diff_format=u Index: php-src/ext/dom/document.c diff -u php-src/ext/dom/document.c:1.79 php-src/ext/dom/document.c:1.80 --- php-src/ext/dom/document.c:1.79 Mon Aug 28 19:31:51 2006 +++ php-src/ext/dom/document.c Sat Sep 16 19:08:59 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: document.c,v 1.79 2006/08/28 19:31:51 rrichards Exp $ */ +/* $Id: document.c,v 1.80 2006/09/16 19:08:59 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1395,8 +1395,9 @@ 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; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php