cvs: php-src /ext/curl interface.c

iliaa Tue Nov 21 15:58:12 2006 UTC Modified files: /php-src/ext/curl interface.c Log: MFB: Adjust previous patch to work better http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.95&r2=1.96&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.95 php-src/ext/curl/interface.c:1.96 --- php-src/ext/curl/interface.c:1.95 Mon Nov 20 19:06:09 2006 +++ php-src/ext/curl/interface.c Tue Nov 21 15:58:12 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.95 2006/11/20 19:06:09 iliaa Exp $ */ +/* $Id: interface.c,v 1.96 2006/11/21 15:58:12 iliaa Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -156,7 +156,7 @@ #define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s), (char *) v, 1); #define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v); -#define PHP_CURL_CHECK_OPEN_BASEDIR(str, len) \ +#define PHP_CURL_CHECK_OPEN_BASEDIR(str, len, __ret) \ if ((PG(open_basedir) && *PG(open_basedir)) && \ strncasecmp(str, "file:", sizeof("file:") - 1) == 0) \ { \ @@ -165,16 +165,19 @@ if (!(tmp_url = php_url_parse_ex(str, len))) { \ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid URL '%s'", str); \ RETVAL_FALSE; \ + return __ret; \ } \ \ 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); \ RETVAL_FALSE; \ + return __ret; \ } \ \ if (tmp_url->query || tmp_url->fragment || php_check_open_basedir(tmp_url->path TSRMLS_CC)) { \ php_url_free(tmp_url); \ RETVAL_FALSE; \ + return __ret; \ } \ php_url_free(tmp_url); \ } @@ -1076,8 +1079,7 @@ if (argc > 0) { convert_to_string_ex(url); - PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(url), Z_STRLEN_PP(url)); - return; + PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(url), Z_STRLEN_PP(url), (void) NULL); } cp = curl_easy_init(); @@ -1302,8 +1304,7 @@ convert_to_string_ex(zvalue); if (option == CURLOPT_URL) { - PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue)); - return 1; + PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue), 1); } copystr = estrndup(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue));