From: Richard W.M. Jones <rjones@redhat.com>
Date: Mon, 10 Jun 2013 16:40:15 +0000 (+0100)
Subject: curl: Don't set curl options on the handle just before it's going to be deleted.
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8da1aa15db2f55c42bdcea95e27b1a190d2be754;p=qemu.git

curl: Don't set curl options on the handle just before it's going to be deleted.

(Found by Kamil Dudka)

Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
Cc: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block/curl.c b/block/curl.c
index 0fba451e3b..6af8cb7577 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -452,8 +452,6 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags)
     if (curl_easy_perform(state->curl))
         goto out;
     curl_easy_getinfo(state->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &d);
-    curl_easy_setopt(state->curl, CURLOPT_WRITEFUNCTION, (void *)curl_read_cb);
-    curl_easy_setopt(state->curl, CURLOPT_NOBODY, 0);
     if (d)
         s->len = (size_t)d;
     else if(!s->len)