cvs: php4(PHP_4_3) /ext/domxml php_domxml.c
| From: | Ilia Alshanetsky | Date: | Fri, 18 Apr 2003 00:20:36 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/domxml php_domxml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20368@lists.php.net to get a copy of this message | ||
iliaa Thu Apr 17 20:20:36 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/domxml php_domxml.c
Log:
MFH
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.218.2.19 php4/ext/domxml/php_domxml.c:1.218.2.20
--- php4/ext/domxml/php_domxml.c:1.218.2.19 Thu Apr 10 09:11:00 2003
+++ php4/ext/domxml/php_domxml.c Thu Apr 17 20:20:36 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.218.2.19 2003/04/10 13:11:00 chregu Exp $ */
+/* $Id: php_domxml.c,v 1.218.2.20 2003/04/18 00:20:36 iliaa Exp $ */
/* TODO
* - Support Notation Nodes
@@ -3809,6 +3809,10 @@
DOMXML_PARAM_FOUR(docp, id, le_domxmldocp, "s|ll", &file, &file_len,
&compressmode, &format);
+ if ((PG(safe_mode) && (!php_checkuid(file, NULL, CHECKUID_CHECK_FILE_AND_DIR))) ||
php_check_open_basedir(file TSRMLS_CC)) {
+ RETURN_FALSE;
+ }
+
xmlSetCompressMode(compressmode);
if (format) {
@@ -5432,6 +5436,9 @@
}
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "os|l", &idxml, &filename,
&filename_len, &compression) == FAILURE) {
+ RETURN_FALSE;
+ }
+ if ((PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) ||
php_check_open_basedir(filename TSRMLS_CC)) {
RETURN_FALSE;
}