From patchwork Fri May 25 22:52:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 9085 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp117870jad; Fri, 25 May 2018 15:53:28 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpiukGOFSlnt1VHLeq8hMvPHeiEVQrZq5E3H27TiUPP70RlSm6vQQKnmQ1hs+yUVVVZFy9m X-Received: by 2002:a1c:b943:: with SMTP id j64-v6mr2733063wmf.30.1527288807977; Fri, 25 May 2018 15:53:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527288807; cv=none; d=google.com; s=arc-20160816; b=bF+fC/ykuqzXf5lk5Y8nkzDAKh1pArKUryskHAq6mqIeYd1TuaiSR1aw9i4SVKNmd0 xIziVhwLdaSy+smGi3cAgt9LYhQyWI2IbVg4oVNpvAe8ODgvrZ4520t8LZokTZi9dQvH Y3F9wLksDYS/UFi7NbPlaLli8WgnfUUkwmUHN9tNV9DudlqsPELlgwllr/57uodYV9S1 9jWoFWKOpo/YriXnhVby+C5jKP83vgUhO05O65e6ou/MsKwDYntsjhdSS1DZkac0l3V4 OsJGqM0zBUaFuSx1Z8p6d5NBuBxv+fuxt3NVxg0T2hikqypiB7JD9ZqZtfjy0z+qCWOL 2crw== 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=bmX+9zrlIkzknsai6MS9HHee4k6N89FyfsvNFbaC03Q=; b=RQixQ7Kgo1uvdRm/WY8Ocj3L5h/IASUTGEJ22KVCHdhn7JYwTTsbpCOoC+58Racq/L VQMC+tBgnuC7gJEBun3/xPVDxv3Tu2xmBvzGNpOGIlKrfEyfXKIxdvMhAkjfJoQTQjCy fBKeMij5Gz5SoAlMiiDSQJ7S/LcHKmCvDRUlRJ0k8FO+5DWUc/VXZgEJqUQJvueGv/C2 i0CHeHxKfwzE3e4znaa7WlZhlFqiWFiFGGWa9iqGOClCU/ZXtUneqYEPpNZexqnm5Ur4 CzCiTwySC7bvCOMmWNvjTZBa/k0QwvQtVzfw5q9rVnsNlufR+V0mlTXjjnyphBH9klPp 0+9g== 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 m26-v6si8806820wrf.442.2018.05.25.15.53.27; Fri, 25 May 2018 15:53:27 -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 5BF2368A3CE; Sat, 26 May 2018 01:52:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpout.aon.at (smtpout.aon.at [195.3.96.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8884D68A3A7 for ; Sat, 26 May 2018 01:52:16 +0300 (EEST) Received: (qmail 32562 invoked from network); 25 May 2018 22:52:58 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on WARSBL505.highway.telekom.at X-Spam-Level: Received: from 100-65-71-253.rfc6598.a1.net (HELO localhost) ([100.65.71.253]) (envelope-sender ) by smarthub78.res.a1.net (qmail-ldap-1.03) with DHE-RSA-AES256-SHA256 encrypted SMTP for ; 25 May 2018 22:52:57 -0000 X-A1Mail-Track-Id: 1527288777:32540:smarthub78:100.65.71.253:1 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 26 May 2018 00:52:46 +0200 Message-Id: <20180525225247.7886-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180525225247.7886-1-michael@niedermayer.cc> References: <20180525225247.7886-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/ac3dec: Fix null pointer dereference in ac3_decode_frame() 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: index 8 out of bounds for type 'uint8_t *[8]' Fixes: 7273/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EAC3_fuzzer-6296497667702784 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/ac3dec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 1d3180b935..317b2bd800 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1738,7 +1738,9 @@ dependent_frame: for (ch = 0; ch < avctx->channels; ch++) { int map = extended_channel_map[ch]; - memcpy((SHORTFLOAT *)frame->data[ch], s->output_buffer[map], + av_assert0(ch>=AV_NUM_DATA_POINTERS || frame->extended_data[ch] == frame->data[ch]); + memcpy((SHORTFLOAT *)frame->extended_data[ch], + s->output_buffer[map], s->num_blocks * AC3_BLOCK_SIZE * sizeof(SHORTFLOAT)); }