From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 30 Nov 2008 17:35:56 +0000 (+0000)
Subject: MFB: Fixed bug #46711 (cURL curl_setopt leaks memory in foreach loops).
X-Git-Tag: BEFORE_HEAD_NS_CHANGES_MERGE~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=926c4f4a252888baa7c20917fcfa08ce9ee2e700;p=php

MFB: Fixed bug #46711 (cURL curl_setopt leaks memory in foreach loops).
---

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 0efb2384da..6967d2c4e2 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1793,17 +1793,17 @@ type_conflict:
    Set an option for a cURL transfer */
 PHP_FUNCTION(curl_setopt)
 {
-	zval       *zid, *zvalue;
+	zval       *zid, **zvalue;
 	long	   options;
 	php_curl    *ch;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zlz", &zid, &options, &zvalue) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zlZ", &zid, &options, &zvalue) == FAILURE) {
 		RETURN_FALSE;
 	}
 
 	ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
 
-	if (!_php_curl_setopt(ch, options, &zvalue, return_value TSRMLS_CC)) {
+	if (!_php_curl_setopt(ch, options, zvalue, return_value TSRMLS_CC)) {
 		RETURN_TRUE;
 	} else {
 		RETURN_FALSE;