cvs: php-src /ext/curl multi.c
| From: | Ilia Alshanetsky | Date: | Tue, 09 Mar 2004 15:04:17 +0000 |
| Subject: | cvs: php-src /ext/curl multi.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-26567@lists.php.net to get a copy of this message | ||
iliaa Tue Mar 9 10:04:17 2004 EDT
Modified files:
/php-src/ext/curl multi.c
Log:
Fixed memory leak with curl_multi_init() de-initialization.
http://cvs.php.net/diff.php/php-src/ext/curl/multi.c?r1=1.13&r2=1.14&ty=u
Index: php-src/ext/curl/multi.c
diff -u php-src/ext/curl/multi.c:1.13 php-src/ext/curl/multi.c:1.14
--- php-src/ext/curl/multi.c:1.13 Thu Jan 8 03:14:37 2004
+++ php-src/ext/curl/multi.c Tue Mar 9 10:04:16 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: multi.c,v 1.13 2004/01/08 08:14:37 andi Exp $ */
+/* $Id: multi.c,v 1.14 2004/03/09 15:04:16 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -250,7 +250,11 @@
void _php_curl_multi_close(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
php_curlm *mh = (php_curlm *) rsrc->ptr;
- curl_multi_cleanup(mh->multi);
+ if (mh) {
+ curl_multi_cleanup(mh->multi);
+ efree(mh);
+ rsrc->ptr = NULL;
+ }
/* XXX: keep track of all curl handles and zval_ptr_dtor them here */
}