iliaa Sun Nov 30 17:35:56 2008 UTC Modified files: /php-src/ext/curl interface.c Log: MFB: Fixed bug #46711 (cURL curl_setopt leaks memory in foreach loops). http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.135&r2=1.136&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.135 php-src/ext/curl/interface.c:1.136 --- php-src/ext/curl/interface.c:1.135 Thu Nov 27 19:02:44 2008 +++ php-src/ext/curl/interface.c Sun Nov 30 17:35:56 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.135 2008/11/27 19:02:44 dmitry Exp $ */ +/* $Id: interface.c,v 1.136 2008/11/30 17:35:56 iliaa Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -1793,17 +1793,17 @@ 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;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php