Commit 38bbc0a5 authored by Matthew Booth's avatar Matthew Booth Committed by Kevin Wolf
Browse files

curl: Fix return from curl_read_cb with invalid state 



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: default avatarMatthew Booth <mbooth@redhat.com>
Tested-by: default avatarRichard W.M. Jones <rjones@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 9e550b32

block/curl.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

}