Patch fix-options-5.5 for *General Issues Bug #68089

Patch version 2014-09-29 01:01 UTC

Obsolete patches:

• bug68089.diff, revision 2014-09-25 10:40 UTC
• fix-5.5, revision 2014-09-29 00:54 UTC
• fix-options-5.5, revision 2014-09-29 00:56 UTC
• fix-options-5.5, revision 2014-09-29 00:57 UTC

Developer: stas@php.net

 commit 373a219e6a30a082116dd4341c27731d8590e60d
 commit 67c7303d453635dce8ab0ea1871d69a184998bbd
  Author: Stanislav Malyshev <stas@php.net>
  Date:   Sun Sep 28 17:53:49 2014 -0700
  
      Fix bug #68089 - do not accept options with embedded \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 0000000..34bbf0d
 --- /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 %d contains invalid characters (\0) in %s/bug68089.php on line 4
 +bool(false)
 +Done
 \ No newline at end of file