diff options
author | Stanislav Malyshev <stas@php.net> | 2014-09-28 17:53:49 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-10-13 23:16:06 -0700 |
commit | ab0939e5e5449cba04b02fff3a5595f725bce0a0 (patch) | |
tree | b3450473c91215fda7d12ed65b22a8c3ec83cd7e /ext/curl/interface.c | |
parent | 56754a7f9eba0e4f559b6ca081d9f2a447b3f159 (diff) | |
download | php-git-ab0939e5e5449cba04b02fff3a5595f725bce0a0.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.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 8915625047..23b125238d 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -170,6 +170,12 @@ static int php_curl_option_url(php_curl *ch, const char *url, const int len TSRM #if LIBCURL_VERSION_NUM < 0x071100 char *copystr = NULL; #endif + + if (strlen(url) != len) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Curl option contains invalid characters (\\0)"); + return 0; + } + /* Disable file:// if open_basedir are used */ if (PG(open_basedir) && *PG(open_basedir)) { #if LIBCURL_VERSION_NUM >= 0x071304 |