input_curl: don't do temporary calculations with input_stream.offset

If someone calls seek() with an invalid (negative) offset, the curl implementation of that method returned false, but left this invalid offset in input_stream.offset. Move the calculation to a temporary variable.

input_curl: don't do temporary calculations with input_stream.offset
7779e413 · Max Kellermann · a165ee25 · 7779e413
Commit 7779e413 authored Nov 21, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

input_curl.c src/input_curl.c +4 -4

No files found.
--- a/src/input_curl.c
+++ b/src/input_curl.c
@@ -569,11 +569,10 @@ input_curl_seek(struct input_stream *is, off_t offset, int whence)

 	switch (whence) {
 	case SEEK_SET:
-		is->offset = offset;
 		break;

 	case SEEK_CUR:
-		is->offset += offset;
+		offset += is->offset;
 		break;

 	case SEEK_END:
@@ -581,20 +580,21 @@ input_curl_seek(struct input_stream *is, off_t offset, int whence)
 			/* stream size is not known */
 			return false;

-		is->offset = is->size + offset;
+		offset += is->size;
 		break;

 	default:
 		return false;
 	}

-	if (is->offset < 0)
+	if (offset < 0)
 		return false;

 	/* close the old connection and open a new one */

 	input_curl_easy_free(c);

+	is->offset = offset;
 	if (is->offset == is->size) {
 		/* seek to EOF: simulate empty result; avoid
 		   triggering a "416 Requested Range Not Satisfiable"