iliaa Sun May 21 16:31:57 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/curl interface.c
Log:
Added control character checks for cURL extension's open_basedir/safe_mode
checks.
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.37&r2=1.2027.2.547.2.38&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.37 php-src/NEWS:1.2027.2.547.2.38
--- php-src/NEWS:1.2027.2.547.2.37 Fri May 19 14:52:22 2006
+++ php-src/NEWS Sun May 21 16:31:56 2006
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2006, PHP 5.2.0
+- Added control character checks for cURL extension's open_basedir/safe_mode
+ checks. (Ilia)
- Disable realpath cache when open_basedir or safe_mode are enabled on a
per-request basis. (Ilia)
- Optimized zend_try/zend_catch macroses (eliminated memcpy()). (Dmitry)
http://cvs.php.net/viewcvs.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14&r2=1.62.2.14.2.1&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14
php-src/ext/curl/interface.c:1.62.2.14.2.1
--- php-src/ext/curl/interface.c:1.62.2.14 Thu Apr 13 11:26:10 2006
+++ php-src/ext/curl/interface.c Sun May 21 16:31:57 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14 2006/04/13 11:26:10 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.1 2006/05/21 16:31:57 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -161,11 +161,16 @@
strncasecmp(str, "file:", sizeof("file:") - 1) == 0)
\
{
\
php_url *tmp_url;
\
-
\
+
\
if (!(tmp_url = php_url_parse_ex(str, len))) {
\
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid
url '%s'", str); \
RETURN_FALSE;
\
}
\
+
\
+ if (php_memnstr(str, tmp_url->path, strlen(tmp_url->path), str
+ len)) { \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Url '%s'
contains unencoded control characters.", str); \
+ RETURN_FALSE;
\
+ }
\
\
if (tmp_url->query || tmp_url->fragment ||
php_check_open_basedir(tmp_url->path TSRMLS_CC) ||
\
(PG(safe_mode) && !php_checkuid(tmp_url->path, "rb+",
CHECKUID_CHECK_MODE_PARAM)) \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
