From 772a84d5b949cfcfc07f918ff7318b8e511eb691 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Tue, 2 Mar 2010 12:54:23 +0000 Subject: [PATCH] Fixed bug #51171 (curl_setopt() doesn't output any errors or warnings when an invalid option is provided) --- NEWS | 2 ++ ext/curl/interface.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/NEWS b/NEWS index 99fa8b52b6..699910e728 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,8 @@ PHP NEWS - Added stream filter support to mcrypt extension (ported from mcrypt_filter). (Stas) +- Fixed bug #51171 (curl_setopt() doesn't output any errors or warnings when + an invalid option is provided). (Ilia) ?? ??? 20??, PHP 5.3.2 - Upgraded bundled sqlite to version 3.6.22. (Ilia) diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 37388c59b8..5956b00fbe 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -2095,6 +2095,11 @@ PHP_FUNCTION(curl_setopt) ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl); + if (options <= 0) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid curl configuration option"); + RETURN_FALSE; + } + if (!_php_curl_setopt(ch, options, zvalue, return_value TSRMLS_CC)) { RETURN_TRUE; } else { -- 2.40.0