diff options
| author | Pierrick Charron <pierrick@php.net> | 2012-08-16 14:48:44 -0400 |
|---|---|---|
| committer | Pierrick Charron <pierrick@php.net> | 2012-08-16 14:48:44 -0400 |
| commit | 9cf0139460c7531ebe8fdd523ba6cf7067a7f282 (patch) | |
| tree | a2f4629f2f0aa4ca842af853ac6e4c7ad2729d1c | |
| parent | 8649e4236b12ce9b90356a5804be96bd1f67bcd6 (diff) | |
| download | php-git-9cf0139460c7531ebe8fdd523ba6cf7067a7f282.tar.gz | |
Fixed bug #62839
curl_copy_handle segfault with CURLOPT_FILE. The refcount was incremented
before the assignement.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/curl/interface.c | 4 | ||||
| -rw-r--r-- | ext/curl/tests/bug62839.phpt | 18 |
3 files changed, 21 insertions, 2 deletions
@@ -13,6 +13,7 @@ PHP NEWS with run-test.php). (Laruence) - CURL: + . Fixed bug #62839 (curl_copy_handle segfault with CURLOPT_FILE). (Pierrick) . Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false). (r.hampartsumyan@gmail.com, Laruence) diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 94be60fd5d..7b72873038 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1610,9 +1610,9 @@ PHP_FUNCTION(curl_copy_handle) dupch->uses = 0; ch->uses++; if (ch->handlers->write->stream) { - Z_ADDREF_P(dupch->handlers->write->stream); - dupch->handlers->write->stream = ch->handlers->write->stream; + Z_ADDREF_P(ch->handlers->write->stream); } + dupch->handlers->write->stream = ch->handlers->write->stream; dupch->handlers->write->method = ch->handlers->write->method; dupch->handlers->write->type = ch->handlers->write->type; if (ch->handlers->read->stream) { diff --git a/ext/curl/tests/bug62839.phpt b/ext/curl/tests/bug62839.phpt new file mode 100644 index 0000000000..39e6fc9cbe --- /dev/null +++ b/ext/curl/tests/bug62839.phpt @@ -0,0 +1,18 @@ +--TEST-- +Bug #62839 (curl_copy_handle segfault with CURLOPT_FILE) +--SKIPIF-- +<?php if (!extension_loaded("curl")) print "skip"; +?> +--FILE-- +<?php +$curl = curl_init(); + +$fd = fopen('/tmp/test', 'wb'); +curl_setopt($curl, CURLOPT_FILE, $fd); + +curl_copy_handle($curl); + +echo 'DONE!'; +?> +--EXPECTF-- +DONE! |