From 08e865822a2d65972db79f5bddf60fd8990b818d Mon Sep 17 00:00:00 2001
From: Pascal Massimino <pascal.massimino@gmail.com>
Date: Thu, 8 Dec 2011 06:34:00 -0800
Subject: [PATCH] trap alpha-decoding error

Improves robustness to bad bitstream.

Change-Id: I87ca03ccd12d4d690904b35f8dfc2a20a28fb47b
---
 src/utils/alpha.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/alpha.c b/src/utils/alpha.c
index 70a1f339..d27e3f28 100644
--- a/src/utils/alpha.c
+++ b/src/utils/alpha.c
@@ -350,7 +350,7 @@ static int DecompressZlibTCoder(const uint8_t* data, size_t data_size,
     size_t pos = 0;
     VP8BitReader br;
     VP8InitBitReader(&br, data, data + data_size);
-    while (pos < output_size) {
+    while (pos < output_size && !br.eof_) {
       const int dist = TCoderDecode(coderd, &br);
       if (dist == 0) {
         const int literal = TCoderDecode(coder, &br);
@@ -366,8 +366,8 @@ static int DecompressZlibTCoder(const uint8_t* data, size_t data_size,
         pos += len;
       }
     }
+    ok = !br.eof_;
   }
-  ok = 1;
 
  End:
   if (coder) TCoderDelete(coder);