[PHP-CVS] cvs: php-src(PHP_5_3) /ext/curl interface.c /ext/curl/tests bug46711.phpt

[Ilia Alshanetsky]

iliaa           Sun Nov 30 17:30:50 2008 UTC

  Added files:                 (Branch: PHP_5_3)
    /php-src/ext/curl/tests     bug46711.phpt 

  Modified files:              
    /php-src/ext/curl   interface.c 
  Log:
  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.62.2.14.2.27.2.21&r2=1.62.2.14.2.27.2.22&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.21 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.22
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.21    Thu Nov 27 19:01:22 2008
+++ php-src/ext/curl/interface.c        Sun Nov 30 17:30:50 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.21 2008/11/27 19:01:22 dmitry Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.22 2008/11/30 17:30:50 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1733,17 +1733,17 @@
    Set an option for a cURL transfer */
 PHP_FUNCTION(curl_setopt)
 {
-       zval        *zid, *zvalue;
+       zval        *zid, **zvalue;
        long        zoption;
        php_curl    *ch;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &zid, 
&zoption, &zvalue) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlZ", &zid, 
&zoption, &zvalue) == FAILURE) {
                return;
        }
 
        ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
 
-       if (!_php_curl_setopt(ch, zoption, &zvalue, return_value TSRMLS_CC)) {
+       if (!_php_curl_setopt(ch, zoption, zvalue, return_value TSRMLS_CC)) {
                RETURN_TRUE;
        } else {
                RETURN_FALSE;

http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug46711.phpt?view=markup&rev=1.1
Index: php-src/ext/curl/tests/bug46711.phpt
+++ php-src/ext/curl/tests/bug46711.phpt



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php