Fix a bug in the compress filter in case of odd buffer sizes.
authorAndre Noll <maan@systemlinux.org>
Tue, 5 Jan 2010 22:07:29 +0000 (23:07 +0100)
committerAndre Noll <maan@systemlinux.org>
Tue, 5 Jan 2010 22:07:29 +0000 (23:07 +0100)
compress_filter.c
error.h

index 14df8d9..a0b53bd 100644 (file)
@@ -110,6 +110,10 @@ next_buffer:
                return;
        btr_merge(btrn, fn->min_iqs);
        length = btr_next_buffer(btrn, &inbuf) & ~(size_t)1;
+       if (length == 0) { /* eof and 1 byte available */
+               ret = -E_COMPRESS_EOF;
+               goto err;
+       }
        ip = (int16_t *)inbuf;
        if (inplace)
                op = ip;
diff --git a/error.h b/error.h
index 538c757..e47fa15 100644 (file)
--- a/error.h
+++ b/error.h
@@ -85,6 +85,7 @@ extern const char **para_errlist[];
 
 #define COMPRESS_FILTER_ERRORS \
        PARA_ERROR(COMPRESS_SYNTAX, "syntax error in compress filter config"), \
+       PARA_ERROR(COMPRESS_EOF, "compress: end of file"), \
 
 
 #define WAV_FILTER_ERRORS \