iliaa Sat Sep 16 19:07:35 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/dom document.c
Log:
One last expand_filepath() check
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/document.c?r1=1.68.2.3.2.2&r2=1.68.2.3.2.3&diff_format=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.68.2.3.2.2
php-src/ext/dom/document.c:1.68.2.3.2.3
--- php-src/ext/dom/document.c:1.68.2.3.2.2 Tue Jun 20 13:21:16 2006
+++ php-src/ext/dom/document.c Sat Sep 16 19:07:35 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: document.c,v 1.68.2.3.2.2 2006/06/20 13:21:16 tony2001 Exp $ */
+/* $Id: document.c,v 1.68.2.3.2.3 2006/09/16 19:07:35 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
