Module: libav Branch: release/0.8 Commit: 6711d410dc130b889f1a85a8408dd5ff99b769bf
Author: Luca Barbato <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Fri May 17 18:29:15 2013 +0200 wavpack: validate samples size parsed in wavpack_decode_block Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected] (cherry picked from commit ed50673066956d6f2201a57c3254569f2ab08d9d) Signed-off-by: Reinhard Tartler <[email protected]> Conflicts: libavcodec/wavpack.c --- libavcodec/wavpack.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 1098873..7ceb947 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -790,6 +790,9 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no, if (!wc->mkv_mode) { s->samples = AV_RL32(buf); buf += 4; + if (s->samples != wc->samples) + return AVERROR_INVALIDDATA; + if (!s->samples) { *got_frame_ptr = 0; return 0; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
