modplug: unknown size is -1; check for empty file

The input_stream API sets size to -1 when the size of the resource is not known. The modplug decoder checked for size==0, which would be an empty file.

modplug: unknown size is -1; check for empty file
0c716405 · Max Kellermann · 961d1722 · 0c716405
Commit 0c716405 authored Jan 24, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 5 deletions

modplug_plugin.c src/decoder/modplug_plugin.c +12 -5

No files found.
--- a/src/decoder/modplug_plugin.c
+++ b/src/decoder/modplug_plugin.c
@@ -38,16 +38,23 @@ static GByteArray *mod_loadfile(struct decoder *decoder, struct input_stream *is
 	int total_len;
 	int ret;

+	if (is->size == 0) {
+		g_warning("file is empty");
+		return NULL;
+	}
+
+	if (is->size > MODPLUG_FILE_LIMIT) {
+		g_warning("file too large");
+		return NULL;
+	}
+
 	//known/unknown size, preallocate array, lets read in chunks
-	if (is->size) {
-		if (is->size > MODPLUG_FILE_LIMIT) {
-			g_warning("file too large\n");
-			return NULL;
-		}
+	if (is->size > 0) {
 		bdatas = g_byte_array_sized_new(is->size);
 	} else {
 		bdatas = g_byte_array_sized_new(MODPLUG_PREALLOC_BLOCK);
 	}
+
 	data = g_malloc(MODPLUG_READ_BLOCK);
 	total_len = 0;
 	do {