better error handling in case of corrupt data

3 files changed, 17 insertions, 4 deletions

diff --git a/src/decode.c b/src/decode.c
index c916b41..c4464aa 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -478,7 +478,11 @@ static int m_zero_block(struct aec_stream *strm)
         i = zero_blocks * strm->block_size;
 
     zero_bytes = i * state->bytes_per_sample;
+
     if (strm->avail_out >= zero_bytes) {
+        if (state->rsi_size - (state->rsip - state->rsi_buffer) < i)
+            return M_ERROR;
+
         memset(state->rsip, 0, i * sizeof(uint32_t));
         state->rsip += i;
         strm->avail_out -= zero_bytes;
@@ -740,11 +744,18 @@ int aec_decode(struct aec_stream *strm, int flush)
     */
 
     struct internal_state *state = strm->state;
+    int status;
 
     strm->total_in += strm->avail_in;
     strm->total_out += strm->avail_out;
 
-    while (state->mode(strm) == M_CONTINUE);
+    do {
+        status = state->mode(strm);
+    } while (status == M_CONTINUE);
+
+    if (status == M_ERROR)
+        return AEC_DATA_ERROR;
+
     state->flush_output(strm);
 
     strm->total_in -= strm->avail_in;
diff --git a/src/decode.h b/src/decode.h
index db4a0a2..724e195 100644
--- a/src/decode.h
+++ b/src/decode.h
@@ -64,6 +64,7 @@
 
 #define M_CONTINUE 1
 #define M_EXIT 0
+#define M_ERROR (-1)
 
 #define MIN(a, b) (((a) < (b))? (a): (b))
 
diff --git a/src/libaec.h b/src/libaec.h
index cab1795..84ad763 100644
--- a/src/libaec.h
+++ b/src/libaec.h
@@ -72,9 +72,10 @@ struct aec_stream {
                                  * 1, ..., 32)
                                  */
     int block_size;             /* block size in samples */
-    int rsi;                    /* Reference sample interval, the number
-                                 * of _blocks_ between consecutive
-                                 * reference samples (up to 4096).
+    int rsi;                    /* Reference sample interval, the
+                                 * number of Coded Data Sets between
+                                 * consecutive reference samples (up
+                                 * to 4096).
                                  */
     int flags;