# HG changeset patch # User mru # Date 1115937185 0 # Node ID 7bbe565d50dbe98bd5a99119a6dc953b7eb39ed3 # Parent 7177bd7f1f4763c8167cbe0de501c9e56eb15d15 check theora version diff -r 7177bd7f1f47 -r 7bbe565d50db oggparsetheora.c --- a/oggparsetheora.c Thu May 12 16:27:05 2005 +0000 +++ b/oggparsetheora.c Thu May 12 22:33:05 2005 +0000 @@ -43,7 +43,7 @@ int cds = st->codec.extradata_size + os->psize + 2; uint8_t *cdp; - if (os->seq > 2) + if(!(os->buf[os->pstart] & 0x80)) return 0; if(!thp){ @@ -56,8 +56,12 @@ init_get_bits(&gb, os->buf + os->pstart, os->psize*8); skip_bits(&gb, 7*8); /* 0x80"theora" */ - skip_bits(&gb, 3*8); - + if(get_bits(&gb, 8) != 3) /* major version */ + return -1; + if(get_bits(&gb, 8) != 2) /* minor version */ + return -1; + skip_bits(&gb, 8); /* revision */ + st->codec.width = get_bits(&gb, 16) << 4; st->codec.height = get_bits(&gb, 16) << 4; @@ -86,8 +90,7 @@ memcpy (cdp, os->buf + os->pstart, os->psize); st->codec.extradata_size = cds; - - return os->seq < 3; + return 1; } static uint64_t