From patchwork Wed Jun 27 18:11:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 9526 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1153064jad; Wed, 27 Jun 2018 11:12:46 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeYGsxLJVE/aAlp3NBV/NB1sHY0S+TJdQMNaez8HToMzwfKyyHkvPBGtFNkjDInZxf74yic X-Received: by 2002:a1c:9bd0:: with SMTP id d199-v6mr5919969wme.16.1530123166214; Wed, 27 Jun 2018 11:12:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530123166; cv=none; d=google.com; s=arc-20160816; b=fZW8kr0eSsUD4Xu1KGgJm9mmyLexk7i54v0xHxWkgh32crLnnmrv+Rr/+aQXn5KJ0U 1Ttz3J7LYJqz9r19DP/2EbsRhVMi49HtctUMIOM+JBqeYA5kFqiUhnYfcm5U88hZpglw ZXFzpL6OYq66WJAhC1yRuUAFu56c0YMsmeLBebs7e923GtdZlaK3u6NQwToGP1r2FTv3 t7lP/xXn2zRYy8A7S519CTdjB6XJ9oXtln2kxazGB6FLYmUuKjQyIX3k/ScR7mzwaxbS 1Amp0aL2BW1OedT6L45DS1wUzmlXFQ5Wxm5UEwH1rpOEMYWTtlz4UnApFQCh2J7rc/pl gBLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=nKp9KvNjUi5XK/6zEjarWfsx6nJjfQdeaI0KOcNVIz4=; b=YEk3ls+zKuJ6MK1Zdky0OwXnxWD83yW94Sm3Wz1/cQPcSWoXR2dpg4kdAQ/GWdHBgL PRN6h8X/ZJzZJmbrM2hUzbtZQs73DlfArYM0ut14/3L3zmejCuNHvw2FRQajuzIgLHIl sjcxEm2nQl/CMQs1oh4C5bPZ/jg5ILFXg3GAvztkNlVo/mZyQ7Brt5I55BuvtJ4bci0a sq9s+e832zRIJ95Q9Wh6DL/bNBgVvJMA3skcn3Fvh3jC9pI2MT2rTig06xxHIH1hk+BM sJ+pEeLwwg2nSxqnNUoFwLcaksSCErJPkItVMfsH3YAZ7d2DPQZOG8Hiy0Pwk2u1t9Xb S/Vg== 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 h3-v6si2950204wmi.179.2018.06.27.11.12.45; Wed, 27 Jun 2018 11:12:46 -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 BEF1868A4CC; Wed, 27 Jun 2018 21:12:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-2.mx.upcmail.net (vie01a-dmta-pe04-2.mx.upcmail.net [62.179.121.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AAE5068A42F for ; Wed, 27 Jun 2018 21:12:14 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fYEvP-0000t8-RJ for ffmpeg-devel@ffmpeg.org; Wed, 27 Jun 2018 20:12:15 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 3uC91y01k0S5wYM01uCAqY; Wed, 27 Jun 2018 20:12:10 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 27 Jun 2018 20:11:18 +0200 Message-Id: <20180627181121.30735-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180627181121.30735-1-michael@niedermayer.cc> References: <20180627181121.30735-1-michael@niedermayer.cc> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/8] avcodec/ac3_parser: Check init_get_bits8() for failure 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: null pointer dereference Fixes: ffmpeg_crash_6.avi Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart Signed-off-by: Michael Niedermayer --- libavcodec/ac3_parser.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index f4618bf215..1e203ae6ac 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -162,7 +162,9 @@ int avpriv_ac3_parse_header(AC3HeaderInfo **phdr, const uint8_t *buf, return AVERROR(ENOMEM); hdr = *phdr; - init_get_bits8(&gb, buf, size); + err = init_get_bits8(&gb, buf, size); + if (err < 0) + return AVERROR_INVALIDDATA; err = ff_ac3_parse_header(&gb, hdr); if (err < 0) return AVERROR_INVALIDDATA;