summaryrefslogtreecommitdiff
path: root/libavcodec/wavpack.c
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@videolan.org>2011-09-07 21:43:03 +0200
committerMartin Storsjö <martin@martin.st>2011-09-10 18:58:57 +0300
commit8bfea4ab4e2cb32bc7bf6f697ee30a238c65d296 (patch)
tree0b62abca570ffe9cc89b8f57e9cd81089476f3ae /libavcodec/wavpack.c
parent6a11686dfc0aed13bf234af85329450cd8c3b225 (diff)
Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/wavpack.c')
-rw-r--r--libavcodec/wavpack.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 0604452b80..a687c279ef 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -863,12 +863,13 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
}
switch(id & WP_IDF_MASK){
case WP_ID_DECTERMS:
- s->terms = size;
- if(s->terms > MAX_TERMS){
+ if(size > MAX_TERMS){
av_log(avctx, AV_LOG_ERROR, "Too many decorrelation terms\n");
+ s->terms = 0;
buf += ssize;
continue;
}
+ s->terms = size;
for(i = 0; i < s->terms; i++) {
s->decorr[s->terms - i - 1].value = (*buf & 0x1F) - 5;
s->decorr[s->terms - i - 1].delta = *buf >> 5;