[FFmpeg-cvslog] avcodec/wmalosslessdec: Reset num_saved_bits on error path
Michael Niedermayer
git at videolan.org
Fri Apr 13 02:58:01 EEST 2018
ffmpeg | branch: release/3.3 | Michael Niedermayer <michael at niedermayer.cc> | Sun Mar 11 00:13:57 2018 +0100| [02bf1c617cdd34a80a290963c23f92a7e01630dc] | committer: Michael Niedermayer
avcodec/wmalosslessdec: Reset num_saved_bits on error path
Fixes: NULL pointer dereference
Fixes: poc-201803.wav
Found-by: GwanYeong Kim <gy741.kim at gmail.com>
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 64c9ce0abc0fd8774b523afda3ddb17c86caa86a)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=02bf1c617cdd34a80a290963c23f92a7e01630dc
---
libavcodec/wmalosslessdec.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 133a3e92d1..59e8929586 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -1148,6 +1148,7 @@ static void save_bits(WmallDecodeCtx *s, GetBitContext* gb, int len,
if (len <= 0 || buflen > s->max_frame_size) {
avpriv_request_sample(s->avctx, "Too small input buffer");
s->packet_loss = 1;
+ s->num_saved_bits = 0;
return;
}
More information about the ffmpeg-cvslog
mailing list