diff options
| author | Thomas Daede <daede003@umn.edu> | 2018-03-15 21:47:09 -0700 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-19 11:22:17 +0200 |
| commit | e0013ce52296653ec8cef594e568c9981e5d4a63 (patch) | |
| tree | 95c90e9a599edec3f134d461dc60d238d6c34dc9 /media/libtremor | |
| parent | cfc10b6a6e2f7d2f7153f957bdb59a94be103a03 (diff) | |
| download | UXP-e0013ce52296653ec8cef594e568c9981e5d4a63.tar UXP-e0013ce52296653ec8cef594e568c9981e5d4a63.tar.gz UXP-e0013ce52296653ec8cef594e568c9981e5d4a63.tar.lz UXP-e0013ce52296653ec8cef594e568c9981e5d4a63.tar.xz UXP-e0013ce52296653ec8cef594e568c9981e5d4a63.zip | |
Bug 1446062: libtremor Vorbis fix. r=jmspeex a=dveditz
--HG--
extra : transplant_source : %D3%CE8%8D%D3%C0%D3%C7%BE%7D%F2m%5DM%E3%A0%E4%0CW%F3
Diffstat (limited to 'media/libtremor')
| -rw-r--r-- | media/libtremor/lib/tremor_codebook.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/media/libtremor/lib/tremor_codebook.c b/media/libtremor/lib/tremor_codebook.c index f8b798384..1e1ae8a91 100644 --- a/media/libtremor/lib/tremor_codebook.c +++ b/media/libtremor/lib/tremor_codebook.c @@ -258,7 +258,7 @@ long vorbis_book_decodevs_add(codebook *book,ogg_int32_t *a, t[i] = book->valuelist+entry[i]*book->dim; } for(i=0,o=0;i<book->dim;i++,o+=step) - for (j=0;j<step;j++) + for (j=0;o+j<n && j<step;j++) a[o+j]+=t[j][i]>>shift; }else{ for (i = 0; i < step; i++) { @@ -267,7 +267,7 @@ long vorbis_book_decodevs_add(codebook *book,ogg_int32_t *a, t[i] = book->valuelist+entry[i]*book->dim; } for(i=0,o=0;i<book->dim;i++,o+=step) - for (j=0;j<step;j++) + for (j=0;o+j<n && j<step;j++) a[o+j]+=t[j][i]<<-shift; } } @@ -287,7 +287,7 @@ long vorbis_book_decodev_add(codebook *book,ogg_int32_t *a, entry = decode_packed_entry_number(book,b); if(entry==-1)return(-1); t = book->valuelist+entry*book->dim; - for (j=0;j<book->dim;) + for (j=0;i<n && j<book->dim;) a[i++]+=t[j++]>>shift; } }else{ @@ -295,7 +295,7 @@ long vorbis_book_decodev_add(codebook *book,ogg_int32_t *a, entry = decode_packed_entry_number(book,b); if(entry==-1)return(-1); t = book->valuelist+entry*book->dim; - for (j=0;j<book->dim;) + for (j=0;i<n && j<book->dim;) a[i++]+=t[j++]<<-shift; } } @@ -352,15 +352,15 @@ long vorbis_book_decodevv_add(codebook *book,ogg_int32_t **a,\ long i,j,entry; int chptr=0; int shift=point-book->binarypoint; - + int m=offset+n; if(shift>=0){ - for(i=offset;i<offset+n;){ + for(i=offset;i<m;){ entry = decode_packed_entry_number(book,b); if(entry==-1)return(-1); { const ogg_int32_t *t = book->valuelist+entry*book->dim; - for (j=0;j<book->dim;j++){ + for (j=0;i<m && j<book->dim;j++){ a[chptr++][i]+=t[j]>>shift; if(chptr==ch){ chptr=0; @@ -371,12 +371,12 @@ long vorbis_book_decodevv_add(codebook *book,ogg_int32_t **a,\ } }else{ - for(i=offset;i<offset+n;){ + for(i=offset;i<m;){ entry = decode_packed_entry_number(book,b); if(entry==-1)return(-1); { const ogg_int32_t *t = book->valuelist+entry*book->dim; - for (j=0;j<book->dim;j++){ + for (j=0;i<m && j<book->dim;j++){ a[chptr++][i]+=t[j]<<-shift; if(chptr==ch){ chptr=0; |