From patchwork Sun Dec 22 14:11:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 16923 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2360E44B06C for ; Sun, 22 Dec 2019 16:41:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E4A3F6897CD; Sun, 22 Dec 2019 16:41:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15-114.126.com (m15-114.126.com [220.181.15.114]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B0356882A2 for ; Sun, 22 Dec 2019 16:41:23 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=tOep47XJxaDzA/TtFn 3AT8D7hDTKKOG4380Zvo3z81Q=; b=ciFYPnNN6CBZZ2ZywzKjqh71pJMLafPgn7 +DdjBhiYUA7zKiq/sVCqJyVY30dckAdCV3ZwO3rv+oMntDviQV341A6OAgLpd3Tn 7ICagz+B02vUcWAsjla8RjytMB8G4QC1QeWKroJpvzrrG9AZETMAYSwZ5Spcn93+ 0svp3BU/k= Received: from localhost.localdomain (unknown [218.108.145.242]) by smtp7 (Coremail) with SMTP id DsmowAD39V53ef9dZP8KBQ--.1438S2; Sun, 22 Dec 2019 22:11:04 +0800 (CST) From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Dec 2019 14:11:01 +0000 Message-Id: <1577023861-14542-1-git-send-email-zhongli_dev@126.com> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: DsmowAD39V53ef9dZP8KBQ--.1438S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrZrW3JFy7Kw4ktr4fCr1ftFb_yoWxurb_JF 1xGF1kCF17Z3WIyw47Xr1Yyry0qwsFva95Xwn5trsrXa9YyFWYqrs29FZYgw43W3s8A34r G3WrXFyaqrsrujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU1HUqUUUUUU== X-Originating-IP: [218.108.145.242] X-CM-SenderInfo: x2kr0wxolbvvby6rjloofrz/1tbiHRiTwFpD-D8DdQAAs6 Subject: [FFmpeg-devel] [PATCH] lavc/midivid: FIX CID 1456088 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Zhong Li MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zhong Li --- libavcodec/midivid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/midivid.c b/libavcodec/midivid.c index 38465c5..6877c60 100644 --- a/libavcodec/midivid.c +++ b/libavcodec/midivid.c @@ -73,7 +73,8 @@ static int decode_mvdv(MidiVidContext *s, AVCodecContext *avctx, AVFrame *frame) if (bytestream2_get_bytes_left(gb) < mask_size) return AVERROR_INVALIDDATA; - init_get_bits8(&mask, mask_start, mask_size); + if (init_get_bits8(&mask, mask_start, mask_size) < 0) + return AVERROR_INVALIDDATA; bytestream2_skip(gb, mask_size); skip = s->skip;