aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2013-10-15 22:34:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-15 22:34:55 +0000
commit9ebb7160db97636a826e833e6e998ea30b2c79bc (patch)
tree5e6983e8a79dafc12b9fbbcc2396b754d012e836
parent3526f71ef36837c05cbdcda23a09f8b4881b70e1 (diff)
parentea4d754fcb81fced7bd1f33ad67f7b50d5fbb291 (diff)
downloadtremolo-9ebb7160db97636a826e833e6e998ea30b2c79bc.tar.gz
Merge "Unify plain C and assembly code behavior."
-rw-r--r--Tremolo/bitwise.c4
1 files changed, 3 insertions, 1 deletions
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 @@ void oggpack_readinit(oggpack_buffer *b,ogg_reference *r){
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 @@ long oggpack_look(oggpack_buffer *b,int bits){
unsigned long ret = 0;
int BITS = bits;
+ if (!b->headptr) return 0;
+
bits+=b->headbit;
if(bits >= b->headend<<3){