Patch bug68089.diff for *General Issues Bug #68089

Patch version 2014-09-25 10:40 UTC

Obsoleted by patches:

• fix-options-5.5, revision 2014-09-29 00:57 UTC
• fix-options-5.5, revision 2014-09-29 01:01 UTC

• 2014-09-25 10:40 UTC [diff to current]

Developer: johannes@php.net

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index d7cacf5..094c8ae 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -170,6 +170,11 @@ static int php_curl_option_str(php_curl *ch, zend_long option, const char *str,
 {
 	CURLcode error = CURLE_OK;
 
+	if (strlen(str) != len) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Curl option %d contains invalid characters (\\0) ignoring");;
+		return FAILURE;
+	}
+
 #if LIBCURL_VERSION_NUM >= 0x071100
 	if (make_copy) {
 #endif