diff options
| -rw-r--r-- | codebook.c | 13 | ||||
| -rw-r--r-- | floor0.c | 5 |
2 files changed, 11 insertions, 7 deletions
@@ -712,6 +712,7 @@ int decode_map(codebook *s, oggpack_buffer *b, ogg_int32_t *v, int point){ } /* returns 0 on OK or -1 on eof *************************************/ +/* decode vector / dim granularity guarding is done in the upper layer */ long vorbis_book_decodevs_add(codebook *book,ogg_int32_t *a, oggpack_buffer *b,int n,int point){ if(book->used_entries>0){ @@ -728,6 +729,7 @@ long vorbis_book_decodevs_add(codebook *book,ogg_int32_t *a, return 0; } +/* decode vector / dim granularity guarding is done in the upper layer */ long vorbis_book_decodev_add(codebook *book,ogg_int32_t *a, oggpack_buffer *b,int n,int point){ if(book->used_entries>0){ @@ -743,6 +745,9 @@ long vorbis_book_decodev_add(codebook *book,ogg_int32_t *a, return 0; } +/* unlike the others, we guard against n not being an integer number + * of <dim> internally rather than in the upper layer (called only by + * floor0) */ long vorbis_book_decodev_set(codebook *book,ogg_int32_t *a, oggpack_buffer *b,int n,int point){ if(book->used_entries>0){ @@ -751,21 +756,21 @@ long vorbis_book_decodev_set(codebook *book,ogg_int32_t *a, for(i=0;i<n;){ if(decode_map(book,b,v,point))return -1; - for (j=0;j<book->dim;j++) + for (j=0;i<n && j<book->dim;j++) a[i++]=v[j]; } }else{ - int i,j; + int i; for(i=0;i<n;){ - for (j=0;j<book->dim;j++) - a[i++]=0; + a[i++]=0; } } return 0; } +/* decode vector / dim granularity guarding is done in the upper layer */ long vorbis_book_decodevv_add(codebook *book,ogg_int32_t **a, long offset,int ch, oggpack_buffer *b,int n,int point){ @@ -393,10 +393,9 @@ ogg_int32_t *floor0_inverse1(vorbis_dsp_state *vd,vorbis_info_floor *i, codebook *b=ci->book_param+info->books[booknum]; ogg_int32_t last=0; - for(j=0;j<info->order;j+=b->dim) - if(vorbis_book_decodev_set(b,lsp+j,&vd->opb,b->dim,-24)==-1)goto eop; + if(vorbis_book_decodev_set(b,lsp,&vd->opb,info->order,-24)==-1)goto eop; for(j=0;j<info->order;){ - for(k=0;k<b->dim;k++,j++)lsp[j]+=last; + for(k=0;j<info->order && k<b->dim;k++,j++)lsp[j]+=last; last=lsp[j-1]; } |