summaryrefslogtreecommitdiff
path: root/ext/curl/interface.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-09-28 17:53:49 -0700
committerStanislav Malyshev <stas@php.net>2014-10-14 10:45:35 -0700
commit71b63fc701b16e326b6ee01369d746aed2c7643c (patch)
tree126a5d0c250ed3a665daf55178a949b716afd477 /ext/curl/interface.c
parent88eb7ea47dd6d23378b116aa76428ef4907c5373 (diff)
downloadphp-git-71b63fc701b16e326b6ee01369d746aed2c7643c.tar.gz
Fix bug #68089 - do not accept options with embedded \0
Conflicts: ext/curl/interface.c
Diffstat (limited to 'ext/curl/interface.c')
-rw-r--r--ext/curl/interface.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index f8b04295d7..e3e089175f 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -169,6 +169,11 @@ static int php_curl_option_str(php_curl *ch, long option, const char *str, const
{
CURLcode error = CURLE_OK;
+ if (strlen(str) != len) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Curl option contains invalid characters (\\0)");
+ return 0;
+ }
+
#if LIBCURL_VERSION_NUM >= 0x071100
if (make_copy) {
#endif