[FFmpeg-cvslog] lavc/mvha: Check init_get_bits8() for failure

Jun Zhao git at videolan.org
Fri Nov 29 04:11:49 EET 2019


ffmpeg | branch: master | Jun Zhao <barryjzhao at tencent.com> | Thu Nov 28 19:42:01 2019 +0800| [2952d9c5dce4014716ed9693f01447254bf42ee3] | committer: Jun Zhao

lavc/mvha: Check init_get_bits8() for failure

fix potential null pointer dereference

Signed-off-by: Jun Zhao <barryjzhao at tencent.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2952d9c5dce4014716ed9693f01447254bf42ee3
---

 libavcodec/mvha.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/mvha.c b/libavcodec/mvha.c
index 636b5e69d5..4b03a79283 100644
--- a/libavcodec/mvha.c
+++ b/libavcodec/mvha.c
@@ -190,7 +190,9 @@ static int decode_frame(AVCodecContext *avctx,
         GetBitContext *gb = &s->gb;
         int first_symbol, symbol;
 
-        init_get_bits8(gb, avpkt->data + 8, avpkt->size - 8);
+        ret = init_get_bits8(gb, avpkt->data + 8, avpkt->size - 8);
+        if (ret < 0)
+            return ret;
 
         skip_bits(gb, 24);
 



More information about the ffmpeg-cvslog mailing list