From patchwork Tue Jul 3 21:05:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 9602 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp58971jad; Tue, 3 Jul 2018 14:07:17 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd4EkPgLZ0N4RPWK56/v0ybATLCzWMqDsTguFqjB1toBtI7qQ6Q5Tk4GDDASz1X6w+lL1ZI X-Received: by 2002:a1c:588d:: with SMTP id m135-v6mr4596729wmb.118.1530652037015; Tue, 03 Jul 2018 14:07:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530652036; cv=none; d=google.com; s=arc-20160816; b=cdUlWotMZuQBbvM8+nU+N7e0Tr8/SAR4UNs32fOwo6GHOE8awuGO47fCuSco9Wf+zv MhUtJJeY57RXbwUsl/9czOgOebmBL6IzfdIpd7++lnzVM/BTByTPbQuwiXwwjCSi4m7T +ZpVhckilQ+iWpJMVT4QjYFk39PsiKhhygF0cnbnCaObRLJJStjcEHMELmlxoN9O3qS3 ZzGJK1wFzaFdcdoA8YAl7om9sr1O0NoInYWcQkVXnzigAwtp3N/nZRpmJq7C4YiODOua BOZWo/YgLx+bqPCorZSrKDlikglx0OyNIhdj9sgeJYMUvwwub6ZLjqLElkrSGpD/tpkm 6zSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=CzMAEUElMGjsvKgHqEEkC2H0/Tcr2qYHeg8gqr7Y2YE=; b=kz38p66/F540BjGrUu1oan5zf8uUAJKMSo2UlyM8d1UMG5rHwpioJ4vhMyEfBNd3OR D/ZGPMwRCA8u58CDEGF+prKoD2Oi/9SzlIvtM93ODRcxtLdiSy2hAB+pFbCwDwwYQxNF mxGrw5kPlZUbBE8uNumuBnMLlueSKdGFDur4bI8cR81mPgK4yIEAbQCJKzs1yO4I5hRq pZwp0Ig5D86mRZOnW2OosyAHHrkhQh7TJDkk5Y96bxICt9Ciztfa5rMq+5hDv6/KhdLq BD2c/oyEgoQms3DMrs7iP4OnU7GREYFLEOqUj1qa07jQPPrB0ogKjg9cmp98E/BnD9JP xPEQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a4-v6si1613532wmc.231.2018.07.03.14.07.16; Tue, 03 Jul 2018 14:07:16 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C49DD68A97D; Wed, 4 Jul 2018 00:06:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-2.mx.upcmail.net (vie01a-dmta-pe05-2.mx.upcmail.net [84.116.36.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A89F268A955 for ; Wed, 4 Jul 2018 00:06:32 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1faSVQ-0006Zr-O2 for ffmpeg-devel@ffmpeg.org; Tue, 03 Jul 2018 23:06:36 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 6M6S1y01B0S5wYM01M6T0A; Tue, 03 Jul 2018 23:06:27 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 3 Jul 2018 23:05:30 +0200 Message-Id: <20180703210530.7493-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180703210530.7493-1-michael@niedermayer.cc> References: <20180703210530.7493-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/mpeg4videodec: Check for bitstream end in read_quant_matrix_ext() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: out of array read Fixes: asff-crash-0e53d0dc491dfdd507530b66562812fbd4c36678 Found-by: Paul Ch Signed-off-by: Michael Niedermayer --- libavcodec/mpeg4videodec.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 2df525e03a..24c280df46 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2867,11 +2867,13 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) return 0; } -static void read_quant_matrix_ext(MpegEncContext *s, GetBitContext *gb) +static int read_quant_matrix_ext(MpegEncContext *s, GetBitContext *gb) { int i, j, v; if (get_bits1(gb)) { + if (get_bits_left(gb) < 64*8) + return AVERROR_INVALIDDATA; /* intra_quantiser_matrix */ for (i = 0; i < 64; i++) { v = get_bits(gb, 8); @@ -2882,6 +2884,8 @@ static void read_quant_matrix_ext(MpegEncContext *s, GetBitContext *gb) } if (get_bits1(gb)) { + if (get_bits_left(gb) < 64*8) + return AVERROR_INVALIDDATA; /* non_intra_quantiser_matrix */ for (i = 0; i < 64; i++) { get_bits(gb, 8); @@ -2889,6 +2893,8 @@ static void read_quant_matrix_ext(MpegEncContext *s, GetBitContext *gb) } if (get_bits1(gb)) { + if (get_bits_left(gb) < 64*8) + return AVERROR_INVALIDDATA; /* chroma_intra_quantiser_matrix */ for (i = 0; i < 64; i++) { v = get_bits(gb, 8); @@ -2898,6 +2904,8 @@ static void read_quant_matrix_ext(MpegEncContext *s, GetBitContext *gb) } if (get_bits1(gb)) { + if (get_bits_left(gb) < 64*8) + return AVERROR_INVALIDDATA; /* chroma_non_intra_quantiser_matrix */ for (i = 0; i < 64; i++) { get_bits(gb, 8); @@ -2905,6 +2913,7 @@ static void read_quant_matrix_ext(MpegEncContext *s, GetBitContext *gb) } next_start_code_studio(gb); + return 0; } static void extension_and_user_data(MpegEncContext *s, GetBitContext *gb, int id)