iliaa Thu Oct 6 16:47:43 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/gd gd_ctx.c gd.c
/php-src/ext/curl interface.c
/php-src NEWS
Log:
MFH: Added missing safe_mode checks.
http://cvs.php.net/diff.php/php-src/ext/gd/gd_ctx.c?r1=1.22&r2=1.22.2.1&ty=u
Index: php-src/ext/gd/gd_ctx.c
diff -u php-src/ext/gd/gd_ctx.c:1.22 php-src/ext/gd/gd_ctx.c:1.22.2.1
--- php-src/ext/gd/gd_ctx.c:1.22 Wed Aug 3 10:07:13 2005
+++ php-src/ext/gd/gd_ctx.c Thu Oct 6 16:47:40 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd_ctx.c,v 1.22 2005/08/03 14:07:13 sniper Exp $ */
+/* $Id: gd_ctx.c,v 1.22.2.1 2005/10/06 20:47:40 iliaa Exp $ */
#include "php_gd.h"
@@ -82,7 +82,7 @@
}
if ((argc == 2) || (argc > 2 && Z_STRLEN_PP(file))) {
- if (!fn || php_check_open_basedir(fn TSRMLS_CC)) {
+ if (!fn || php_check_open_basedir(fn TSRMLS_CC) ||
(PG(safe_mode) && !php_checkuid(fn, "rb+", CHECKUID_CHECK_FILE_AND_DIR))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid
filename '%s'", fn);
RETURN_FALSE;
}
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.312&r2=1.312.2.1&ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312 php-src/ext/gd/gd.c:1.312.2.1
--- php-src/ext/gd/gd.c:1.312 Wed Aug 3 10:07:12 2005
+++ php-src/ext/gd/gd.c Thu Oct 6 16:47:40 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.312 2005/08/03 14:07:12 sniper Exp $ */
+/* $Id: gd.c,v 1.312.2.1 2005/10/06 20:47:40 iliaa Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1723,7 +1723,7 @@
}
if ((argc == 2) || (argc > 2 && Z_STRLEN_PP(file))) {
- if (!fn || php_check_open_basedir(fn TSRMLS_CC)) {
+ if (!fn || php_check_open_basedir(fn TSRMLS_CC) ||
(PG(safe_mode) && !php_checkuid(fn, "rb+", CHECKUID_CHECK_FILE_AND_DIR))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid
filename '%s'", fn);
RETURN_FALSE;
}
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.62.2.1&r2=1.62.2.2&ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.1
php-src/ext/curl/interface.c:1.62.2.2
--- php-src/ext/curl/interface.c:1.62.2.1 Wed Oct 5 10:35:30 2005
+++ php-src/ext/curl/interface.c Thu Oct 6 16:47:41 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.1 2005/10/05 14:35:30 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.2 2005/10/06 20:47:41 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -65,7 +65,7 @@
#define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v);
#define PHP_CURL_CHECK_OPEN_BASEDIR(str, len)
\
- if (PG(open_basedir) && *PG(open_basedir) &&
\
+ if (((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) &&
\
strncasecmp(str, "file://", sizeof("file://") - 1) == 0)
\
{
\
php_url *tmp_url;
\
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.94&r2=1.2027.2.95&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.94 php-src/NEWS:1.2027.2.95
--- php-src/NEWS:1.2027.2.94 Wed Oct 5 10:35:30 2005
+++ php-src/NEWS Thu Oct 6 16:47:41 2005
@@ -30,6 +30,7 @@
. ext/oracle (Jani, Derick)
. ext/ovrimos (Jani, Derick, Pierre)
. ext/pfpro (Jani, Derick, Pierre)
+- Added missing safe_mode checks for image* functions and cURL. (Ilia)
- Added missing safe_mode/open_basedir checks for file uploads. (Ilia)
- Fixed possible INI setting leak via virtual() in Apache 2 sapi. (Ilia)
- Fixed potential GLOBALS overwrite via import_request_variables() and
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
