[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/8] curl: Fix return from curl_read_cb with invalid
From: |
Matthew Booth |
Subject: |
[Qemu-devel] [PATCH 3/8] curl: Fix return from curl_read_cb with invalid state |
Date: |
Tue, 29 Apr 2014 16:03:27 +0100 |
A curl write callback is supposed to return the number of bytes it
handled. curl_read_cb would have erroneously reported it had handled
all bytes in the event that the internal curl state was invalid.
Signed-off-by: Matthew Booth <address@hidden>
---
block/curl.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/block/curl.c b/block/curl.c
index e97f449..26c9cac 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -155,7 +155,7 @@ static size_t curl_read_cb(void *ptr, size_t size, size_t
nmemb, void *opaque)
DPRINTF("CURL: Just reading %zd bytes\n", realsize);
if (!s || !s->orig_buf)
- goto read_end;
+ return 0;
if (s->buf_off >= s->buf_len) {
/* buffer full, read nothing */
@@ -180,7 +180,6 @@ static size_t curl_read_cb(void *ptr, size_t size, size_t
nmemb, void *opaque)
}
}
-read_end:
return realsize;
}
--
1.9.0
- [Qemu-devel] [PATCH 0/8] curl: Fix hang reading from slow connections, Matthew Booth, 2014/04/29
- [Qemu-devel] [PATCH 1/8] curl: Fix long line, Matthew Booth, 2014/04/29
- [Qemu-devel] [PATCH 2/8] curl: Remove unnecessary use of goto, Matthew Booth, 2014/04/29
- [Qemu-devel] [PATCH 5/8] curl: Remove unnecessary explicit calls to internal event handler, Matthew Booth, 2014/04/29
- [Qemu-devel] [PATCH 4/8] curl: Remove erroneous sleep waiting for curl completion, Matthew Booth, 2014/04/29
- [Qemu-devel] [PATCH 7/8] curl: Ensure all informationals are checked for completion, Matthew Booth, 2014/04/29
- [Qemu-devel] [PATCH 3/8] curl: Fix return from curl_read_cb with invalid state,
Matthew Booth <=
- [Qemu-devel] [PATCH 6/8] curl: Eliminate unnecessary use of curl_multi_socket_all, Matthew Booth, 2014/04/29
- [Qemu-devel] [PATCH 8/8] curl: Fix hang reading from slow connections, Matthew Booth, 2014/04/29
- Re: [Qemu-devel] [PATCH 0/8] curl: Fix hang reading from slow connections, Richard W.M. Jones, 2014/04/29
- Re: [Qemu-devel] [PATCH 0/8] curl: Fix hang reading from slow connections, Kevin Wolf, 2014/04/30