cvs: php-src(PHP_5_2) /ext/curl interface.c

iliaa Tue Nov 21 15:53:23 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/curl interface.c Log: Adjust previous patch to work better http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.14&r2=1.62.2.14.2.15&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.62.2.14.2.14 php-src/ext/curl/interface.c:1.62.2.14.2.15 --- php-src/ext/curl/interface.c:1.62.2.14.2.14 Mon Nov 20 19:04:21 2006 +++ php-src/ext/curl/interface.c Tue Nov 21 15:53:23 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.62.2.14.2.14 2006/11/20 19:04:21 iliaa Exp $ */ +/* $Id: interface.c,v 1.62.2.14.2.15 2006/11/21 15:53:23 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)) || PG(safe_mode)) && \ strncasecmp(str, "file:", sizeof("file:") - 1) == 0) \ { \ @@ -165,11 +165,13 @@ 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) || \ @@ -177,6 +179,7 @@ ) { \ php_url_free(tmp_url); \ RETVAL_FALSE; \ + return __ret; \ } \ php_url_free(tmp_url); \ } @@ -1078,8 +1081,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(); @@ -1304,8 +1306,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));