Skip to content

Commit

Permalink
curl: Fix return from curl_read_cb with invalid state
Browse files Browse the repository at this point in the history
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 <mbooth@redhat.com>
Tested-by: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
mdbooth authored and kevmw committed Apr 30, 2014
1 parent 9e550b3 commit 38bbc0a
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions block/curl.c
Expand Up @@ -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 */
Expand All @@ -180,7 +180,6 @@ static size_t curl_read_cb(void *ptr, size_t size, size_t nmemb, void *opaque)
}
}

read_end:
return realsize;
}

Expand Down

0 comments on commit 38bbc0a

Please sign in to comment.