Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-25 23:42:56 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-09-25 23:50:27 +0400
commit851a6e2f1aee6b254dd5155a358955c19926087a (patch)
tree255aa0f85651c546f82987bbc77ffed573378621 /libavcodec/wmalosslessdec.c
parentf5498ef38daa541f03b9c8d3985579394c8407e5 (diff)
avcodec/wmalosslessdec: Fix return code for invalid buffer sizes
Fixes infinite loop Fixes Ticket2979 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmalosslessdec.c')
-rw-r--r--libavcodec/wmalosslessdec.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 50927cae1a..df44855e53 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -1178,8 +1178,10 @@ static int decode_packet(AVCodecContext *avctx, void *data, int *got_frame_ptr,
s->packet_done = 0;
/* sanity check for the buffer length */
- if (buf_size < avctx->block_align)
- return 0;
+ if (buf_size < avctx->block_align) {
+ av_log(avctx, AV_LOG_ERROR, "buf size %d invalid\n", buf_size);
+ return AVERROR_INVALIDDATA;
+ }
s->next_packet_start = buf_size - avctx->block_align;
buf_size = avctx->block_align;