commit 6c406ff48009429bb8587d67251d2575a064449b
author Marco Nelissen <marcone@google.com> Fri Mar 28 19:16:45 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 28 19:16:45 2014 +0000
tree c6df3f26d824463511e868f976fa1b6b15714b83
parent ca3b63b662e690a350ed6e2faa8c0c15cacb6384
parent 82cc1a4a5ee1c6f628c0ca9107d4162afa76d6c9

am 82cc1a4a: am ff9b5b2d: Don\'t crash on corrupt files

* commit '82cc1a4a5ee1c6f628c0ca9107d4162afa76d6c9':
  Don't crash on corrupt files

Tremolo/bitwise.c

diff --git a/Tremolo/bitwise.c b/Tremolo/bitwise.c
index 2182641..42be784 100644
--- a/Tremolo/bitwise.c
+++ b/Tremolo/bitwise.c
@@ -187,7 +187,7 @@
 
   b->tail=b->head=r;
   b->count=0;
-  if (b->head) {
+  if (b->head && r->length) {
     b->headptr=b->head->buffer->data+b->head->begin;
     b->headend=b->head->length;
   } else {
@@ -217,6 +217,8 @@
   unsigned long ret = 0;
   int BITS = bits;
 
+  if (!b->headptr) return 0;
+
   bits+=b->headbit;
 
   if(bits >= b->headend<<3){