Added control character checks for cURL extension's open_basedir/safe_mode

checks.

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index a203578712c976c9aa6113e66df65d502ed20967..0c9fb40d59a64d403fd1739bb2342dd56131a2ce 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -161,11 +161,16 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
            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)) { \
                        php_url_free(tmp_url);                                                                                                                          \