jani Fri Nov 16 14:18:59 2007 UTC Modified files: /php-src/ext/curl interface.c Log: - Fixed bug #43092 (curl_copy_handle() crashes with > 32 chars long URL) http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.118&r2=1.119&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.118 php-src/ext/curl/interface.c:1.119 --- php-src/ext/curl/interface.c:1.118 Wed Oct 3 20:32:52 2007 +++ php-src/ext/curl/interface.c Fri Nov 16 14:18:59 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.118 2007/10/03 20:32:52 mike Exp $ */ +/* $Id: interface.c,v 1.119 2007/11/16 14:18:59 jani Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -1076,9 +1076,9 @@ memset(&(*ch)->err, 0, sizeof((*ch)->err)); - zend_llist_init(&(*ch)->to_free.str, sizeof(char *), (void(*)(void *)) curl_free_string, 0); - zend_llist_init(&(*ch)->to_free.slist, sizeof(struct curl_slist), (void(*)(void *)) curl_free_slist, 0); - zend_llist_init(&(*ch)->to_free.post, sizeof(struct HttpPost), (void(*)(void *)) curl_free_post, 0); + zend_llist_init(&(*ch)->to_free.str, sizeof(char *), (llist_dtor_func_t) curl_free_string, 0); + zend_llist_init(&(*ch)->to_free.slist, sizeof(struct curl_slist), (llist_dtor_func_t) curl_free_slist, 0); + zend_llist_init(&(*ch)->to_free.post, sizeof(struct HttpPost), (llist_dtor_func_t) curl_free_post, 0); } /* }}} */ @@ -1210,6 +1210,8 @@ curl_easy_setopt(dupch->cp, CURLOPT_WRITEHEADER, (void *) dupch); zend_llist_copy(&dupch->to_free.str, &ch->to_free.str); + /* Don't try to free copied strings, they're free'd when the original handle is destroyed */ + dupch->to_free.str.dtor = NULL; zend_llist_copy(&dupch->to_free.slist, &ch->to_free.slist); zend_llist_copy(&dupch->to_free.post, &ch->to_free.post);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php