diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-09-28 17:53:49 -0700 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2014-10-15 11:43:37 +0200 |
| commit | cc1fe72bc99ae92d2e14275fd97f34960db24032 (patch) | |
| tree | 37bf0f99dc8e68120ad43a3662d6a1008e16b3de | |
| parent | 4af06aca40ac4c592a71a0b1206a50fad994de21 (diff) | |
| download | php-git-cc1fe72bc99ae92d2e14275fd97f34960db24032.tar.gz | |
Fix bug #68089 - do not accept options with embedded \0
Conflicts:
ext/curl/interface.c
| -rw-r--r-- | ext/curl/interface.c | 5 | ||||
| -rw-r--r-- | ext/curl/tests/bug68089.phpt | 18 |
2 files changed, 23 insertions, 0 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 765918cc35..eab2edf663 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 diff --git a/ext/curl/tests/bug68089.phpt b/ext/curl/tests/bug68089.phpt new file mode 100644 index 0000000000..3bd5889709 --- /dev/null +++ b/ext/curl/tests/bug68089.phpt @@ -0,0 +1,18 @@ +--TEST-- +Bug #68089 (NULL byte injection - cURL lib) +--SKIPIF-- +<?php +include 'skipif.inc'; + +?> +--FILE-- +<?php +$url = "file:///etc/passwd\0http://google.com"; +$ch = curl_init(); +var_dump(curl_setopt($ch, CURLOPT_URL, $url)); +?> +Done +--EXPECTF-- +Warning: curl_setopt(): Curl option contains invalid characters (\0) in %s/bug68089.php on line 4 +bool(false) +Done |