[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.8 10/13] block/curl: Fix return value from curl
From: |
Jeff Cody |
Subject: |
[Qemu-devel] [PULL for-2.8 10/13] block/curl: Fix return value from curl_read_cb |
Date: |
Mon, 14 Nov 2016 23:14:48 -0500 |
From: Max Reitz <address@hidden>
While commit 38bbc0a580f9f10570b1d1b5d3e92f0e6feb2970 is correct in that
the callback is supposed to return the number of bytes handled; what it
does not mention is that libcurl will throw an error if the callback did
not "handle" all of the data passed to it.
Therefore, if the callback receives some data that it cannot handle
(either because the receive buffer has not been set up yet or because it
would not fit into the receive buffer) and we have to ignore it, we
still have to report that the data has been handled.
Obviously, this should not happen normally. But it does happen at least
for FTP connections where some data (that we do not expect) may be
generated when the connection is established.
Cc: address@hidden
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>
---
block/curl.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/block/curl.c b/block/curl.c
index 1d19e64..7a7e831 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -211,12 +211,13 @@ 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)
- return 0;
+ if (!s || !s->orig_buf) {
+ goto read_end;
+ }
if (s->buf_off >= s->buf_len) {
/* buffer full, read nothing */
- return 0;
+ goto read_end;
}
realsize = MIN(realsize, s->buf_len - s->buf_off);
memcpy(s->orig_buf + s->buf_off, ptr, realsize);
@@ -237,7 +238,9 @@ static size_t curl_read_cb(void *ptr, size_t size, size_t
nmemb, void *opaque)
}
}
- return realsize;
+read_end:
+ /* curl will error out if we do not return this value */
+ return size * nmemb;
}
static int curl_find_buf(BDRVCURLState *s, size_t start, size_t len,
--
2.7.4
- [Qemu-devel] [PULL for-2.8 00/13] Block patches for 2.8, Jeff Cody, 2016/11/14
- [Qemu-devel] [PULL for-2.8 01/13] blockjob: fix dead pointer in txn list, Jeff Cody, 2016/11/14
- [Qemu-devel] [PULL for-2.8 02/13] blockjob: add .clean property, Jeff Cody, 2016/11/14
- [Qemu-devel] [PULL for-2.8 03/13] blockjob: add .start field, Jeff Cody, 2016/11/14
- [Qemu-devel] [PULL for-2.8 04/13] blockjob: add block_job_start, Jeff Cody, 2016/11/14
- [Qemu-devel] [PULL for-2.8 07/13] qemu-iotests: avoid spurious failure on test 109, Jeff Cody, 2016/11/14
- [Qemu-devel] [PULL for-2.8 05/13] blockjob: refactor backup_start as backup_job_create, Jeff Cody, 2016/11/14
- [Qemu-devel] [PULL for-2.8 06/13] iotests: add transactional failure race test, Jeff Cody, 2016/11/14
- [Qemu-devel] [PULL for-2.8 09/13] block/curl: Use BDRV_SECTOR_SIZE, Jeff Cody, 2016/11/14
- [Qemu-devel] [PULL for-2.8 10/13] block/curl: Fix return value from curl_read_cb,
Jeff Cody <=
- [Qemu-devel] [PULL for-2.8 08/13] block/curl: Drop TFTP "support", Jeff Cody, 2016/11/14
- [Qemu-devel] [PULL for-2.8 11/13] block/curl: Remember all sockets, Jeff Cody, 2016/11/14
- [Qemu-devel] [PULL for-2.8 12/13] block/curl: Do not wait for data beyond EOF, Jeff Cody, 2016/11/14
- [Qemu-devel] [PULL for-2.8 13/13] mirror: do not flush every time the disks are synced, Jeff Cody, 2016/11/14
- Re: [Qemu-devel] [Qemu-block] [PULL for-2.8 00/13] Block patches for 2.8, Stefan Hajnoczi, 2016/11/15