From edd9ed6a3bbe0a351fdf09b3d4b33c8d2fd66899 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Thu, 11 Aug 2011 08:19:39 -0400 Subject: stop progress callbacks after curl_easy_perform returns This prevents possible null dereferences in FTP transfers when the progress callback is touched during connection teardown. http://curl.haxx.se/mail/lib-2011-08/0128.html Signed-off-by: Dave Reisner Signed-off-by: Dan McGee --- lib/libalpm/dload.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/libalpm/dload.c') diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 4fd744ef..67090845 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -302,6 +302,9 @@ static int curl_download_internal(struct dload_payload *payload, /* perform transfer */ handle->curlerr = curl_easy_perform(handle->curl); + /* immediately unhook the progress callback */ + curl_easy_setopt(handle->curl, CURLOPT_NOPROGRESS, 1L); + /* was it a success? */ if(handle->curlerr == CURLE_ABORTED_BY_CALLBACK) { goto cleanup; -- cgit v1.2.3-24-g4f1b