From f09218a04c41ba5aca684e3b8ca95f78bbc214bf Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Mon, 20 Nov 2006 19:06:09 +0000 Subject: [PATCH] MFB: Fixed compiler warnings --- ext/curl/interface.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 05add1a614..2bbdf10c02 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -164,17 +164,17 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC); \ if (!(tmp_url = php_url_parse_ex(str, len))) { \ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid URL '%s'", str); \ - RETURN_FALSE; \ + RETVAL_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; \ + RETVAL_FALSE; \ } \ \ if (tmp_url->query || tmp_url->fragment || php_check_open_basedir(tmp_url->path TSRMLS_CC)) { \ php_url_free(tmp_url); \ - RETURN_FALSE; \ + RETVAL_FALSE; \ } \ php_url_free(tmp_url); \ } @@ -1077,6 +1077,7 @@ PHP_FUNCTION(curl_init) if (argc > 0) { convert_to_string_ex(url); PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(url), Z_STRLEN_PP(url)); + return; } cp = curl_easy_init(); @@ -1267,7 +1268,8 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu if (PG(open_basedir) && *PG(open_basedir)) { if (Z_LVAL_PP(zvalue) != 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated when open_basedir is set"); - RETURN_FALSE; + RETVAL_FALSE; + return 1; } } error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue)); @@ -1301,6 +1303,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu if (option == CURLOPT_URL) { PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue)); + return 1; } copystr = estrndup(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue)); @@ -1318,7 +1321,10 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu void * what; what = zend_fetch_resource(zvalue TSRMLS_CC, -1, "File-Handle", &type, 1, php_file_le_stream()); - ZEND_VERIFY_RESOURCE(what); + if (!what) { + RETVAL_FALSE; + return 1; + } if (FAILURE == php_stream_cast((php_stream *) what, PHP_STREAM_AS_STDIO, (void *) &fp, REPORT_ERRORS)) { RETVAL_FALSE; -- 2.40.0