From 0c71640528c5c566ec4770143c7831ace28b51d1 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 24 Jan 2009 19:16:07 +0100 Subject: 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. --- src/decoder/modplug_plugin.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/decoder/modplug_plugin.c b/src/decoder/modplug_plugin.c index 806f070ec..5113d8a2e 100644 --- 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 { -- cgit v1.2.3