input/curl: don't abort if a packet has only metadata

When a received chunk of data has only icy-metadata, there was no usable data left for input_curl_read() to return, and thus it returned 0 bytes. "0" however is a special value for "end of file" or "error". This patch makes input_curl_read() read more data from the socket, until the read request can be fulfilled (or until there's really EOF).

input/curl: don't abort if a packet has only metadata
af92b1c2 · Max Kellermann · 01655809 · af92b1c2 · af92b1c2
Commit af92b1c2 authored Oct 11, 2009 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

NEWS NEWS +2 -0

curl_input_plugin.c src/input/curl_input_plugin.c +2 -0

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.15.5 (2009/??/??)
+* input:
+  - curl: don't abort if a packet has only metadata
 ver 0.15.4 (2009/10/03)

--- a/src/input/curl_input_plugin.c
+++ b/src/input/curl_input_plugin.c
@@ -443,6 +443,7 @@ input_curl_read(struct input_stream *is, void *ptr, size_t size)
 	}
 #endif
+	do {
 		/* fill the buffer */
 		success = fill_buffer(is);
@@ -468,6 +469,7 @@ input_curl_read(struct input_stream *is, void *ptr, size_t size)
 			nbytes += copy;
 			size -= copy;
 		}
+	} while (nbytes == 0);
 	if (icy_defined(&c->icy_metadata))
 		copy_icy_tag(c);