From patchwork Thu Sep 29 23:09:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 38470 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1319775pzh; Thu, 29 Sep 2022 16:09:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5zLN1nB9waFRYLZD/euMDoqmB4USwXt2IruQEhEzegds1x4+M0GSfSmjW9VpHyWUsknaof X-Received: by 2002:aa7:c6d0:0:b0:458:602c:5ef0 with SMTP id b16-20020aa7c6d0000000b00458602c5ef0mr1964916eds.418.1664492989862; Thu, 29 Sep 2022 16:09:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664492989; cv=none; d=google.com; s=arc-20160816; b=LakXjTA9bDDoi44sdemtRxsPYn2yBnn7bVGNdHlIRwsV/Fnb4jsDGYpkFwjiy7l0jU gL8j4fuEQe90TdFv8npUB6mDL20TABQI5PJFroohpYCDyqCeaosoV9PcfcLyFmROJ13r gSa/gP4n9pD38kv+GS/KreUXIz3gQx5CfW8dxeV0IBGIbLeeCJZjgDlQA6p3dDDyOv8w ln1mUb98VV6QqYzhRgZ21YkDTNpNlEswkZOI77W8fFiXR07upJOQwjmRMdPCJ+GPvMOU t1onRRgl8bPRQjshAhet9vWqfo09nI7iXc82WXTVzrYqbkSbJUEX2ATJwtH5OI/eqIrQ lAdg== 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:message-id:date:to:from:delivered-to; bh=CuaCqtqcAPhzsjIYC9HTLSUxy5VuaGV7WxXoyppkBcg=; b=X6bvRS7/GlD5vjKgA9DjMbOnsClf+R94UXA8OKjxtPbvQ75zzOSy70wu+lSoYA7ZlH kLaFihGdY9nBrkXhgdImvApwFK/W7lWze7++wFJDo4CutqJuggTJzHseA5tw0Gz6gDz2 4akhMYZsROA3//TNaiC6VQEw9Lr4GaWXtOHKfgpYVW/VPCLxCQYNAqe7Gnr2njXItPOA db1hWeVwNcPAtNZ/zljJnmE8mobUxWPQQO7WuY48ANUPDJPiCK6lqy6F7OkF1E9U0SX3 4ZLMsXl+mOS1JB5eUzqhfQzpvFRJ4XC9iz2VzsID8MxwO/CgqFJeZU9MnLgMD46URF3r g0vQ== 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 qb29-20020a1709077e9d00b007826e727aeasi632426ejc.44.2022.09.29.16.09.49; Thu, 29 Sep 2022 16:09:49 -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 957A868BB68; Fri, 30 Sep 2022 02:09:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F0A968BB47 for ; Fri, 30 Sep 2022 02:09:30 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oe2em-00FoIb-Tr for ffmpeg-devel@ffmpeg.org; Fri, 30 Sep 2022 01:09:28 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id e2b6oUHpr8s8Ue2emo48rh; Fri, 30 Sep 2022 01:09:28 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id e2eloJ04CbZLDe2eloYG92; Fri, 30 Sep 2022 01:09:28 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=Ufwy9IeN c=1 sm=1 tr=0 ts=633625a8 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=3sFzO6ymNJQNsCFWUWEA:9 a=-Na0Tfbub-lObyeCi0lu:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 30 Sep 2022 01:09:25 +0200 Message-Id: <20220929230927.28439-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfBcqokKAl40R+7hVpH79wbztht6Sh+wJxbIKpVEO5wZtNZPmLo3c58fRG/E7GrSg/8w6HpUWaf+2sPR3ZKwVGiEB6Epx3fwbOdtID7wrL5DlWJf279Uq ukpmGX5bD4AVtb8pR31BFp79snSeCbuiqP+0wY22KilYFmMFw6zuc3qRi9R7AsOKGH7v2BQQIKvY7A== Subject: [FFmpeg-devel] [PATCH 1/3] avformat/vividas: Check packet size X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 3XwPdvcIN4zk Fixes: signed integer overflow: 119760682 - -2084600173 cannot be represented in type 'int' Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_VIVIDAS_fuzzer-6745781167587328 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/vividas.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavformat/vividas.c b/libavformat/vividas.c index e9954f73ed0..ed4e573df87 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -683,6 +683,7 @@ static int viv_read_packet(AVFormatContext *s, if (viv->sb_entries[viv->current_sb_entry].flag == 0) { uint64_t v_size = ffio_read_varlen(pb); + int last = 0, last_start; if (!viv->num_audio) return AVERROR_INVALIDDATA; @@ -706,12 +707,18 @@ static int viv_read_packet(AVFormatContext *s, if (i > 0 && start == 0) break; + if (start < last) + return AVERROR_INVALIDDATA; viv->n_audio_subpackets = i + 1; + last = viv->audio_subpackets[i].start = start; viv->audio_subpackets[i].pcm_bytes = pcm_bytes; } + last_start = viv->audio_subpackets[viv->n_audio_subpackets].start = (int)(off - avio_tell(pb)); + if (last_start < last) + return AVERROR_INVALIDDATA; viv->current_audio_subpacket = 0; } else { From patchwork Thu Sep 29 23:09:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 38471 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1320141pzh; Thu, 29 Sep 2022 16:10:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5A5thmTgdfhxs26xJ1gm8Ax13ZMjDEijAsLeWW0w7MY6qeW5si5J2uZppY1+lxgEXqRYyR X-Received: by 2002:a50:ff0a:0:b0:455:2cc3:920d with SMTP id a10-20020a50ff0a000000b004552cc3920dmr5451443edu.39.1664493037945; Thu, 29 Sep 2022 16:10:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664493037; cv=none; d=google.com; s=arc-20160816; b=sxdzoqsGqI7U2kXUFDW0yLEV5k/TsqtEZ/bsQWR7oRa01u2fuNjpv8c9mPhDoXFxC4 NdtwcZt/eFtIbuxs9+VmB5D0LeS7jgrgYwhdG9bopyx7GBBaF14zksXJvBh8rC4hNYlG kt+A2eAE56lP4EdwhlT5/9Qomd09Q9RRAqHWG/fDGtMNcDPGdMqTKAIfDIjtulB3JiMk QL21cH+7jJ91q0Zf/GyG9M1cEYalDbUjqPDmQbIdKqETzHKT197KtE6uIIV+ILnZkl0t OKPmtSfYqeSDs6FjEzLPq26V9R4SUdx3Aw0svObFigBFPb/D1QOza2KGAx2tCzf1Beqe wn/w== 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; bh=JL06rgxSQA11nC6noiHOWvigln5JcRw3RUyZww5TjUA=; b=TKskkcBfe1YzpPqH/oMnApkJzEQhmMauoEvbXtR2yg6NVHAzahr3PrYAHBn4jMWIad bNC9xsxLBsU2//dZxXUa8SC62cZOTQnGLZICBe3m2C6CIxn7vv0IUBs+oNtPndlOOpfh Jy/bexj86ZEWg/dfiKb6pYJ1z9Nn5odFp/cKteDW36jW2KZmyMk9M1YEpE+fMOKsAPGk UQOdNwTm/snPn3j0vrYxCboQNnVsSgYQeHOMsC631usRWpDDj9rRG/RPoDy045m6ZPk6 wgCRudIk7iWRRnFIn9NnbgrMNhTY5HEiplvfY16n67F5hH+aUCjCaL11TVa2stGtSPYu DFbg== 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 o1-20020a509b01000000b00457cc36dfe3si699034edi.159.2022.09.29.16.10.36; Thu, 29 Sep 2022 16:10:37 -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 AC65C68BB6E; Fri, 30 Sep 2022 02:10:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7835168BB5A for ; Fri, 30 Sep 2022 02:10:28 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oe2fk-00FoId-1T for ffmpeg-devel@ffmpeg.org; Fri, 30 Sep 2022 01:10:28 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id e2b6oUHpr8s8Ue2fko49MI; Fri, 30 Sep 2022 01:10:28 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id e2emoJ04UbZLDe2emoYG96; Fri, 30 Sep 2022 01:09:28 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=Ufwy9IeN c=1 sm=1 tr=0 ts=633625a8 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=Q9UrsvVGrccBEQDGor0A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 30 Sep 2022 01:09:26 +0200 Message-Id: <20220929230927.28439-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220929230927.28439-1-michael@niedermayer.cc> References: <20220929230927.28439-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfMtl41bYGeuFBOYhWhXelbr/jzMFlDBfkO/k1eOnsnJaP7DlqUdjRxpY7wMspcgPxeHE+QI6Cy5y6NWFbiyvthy0KExlKOq8gwGBwZNEZ88EgO5OrZs7 wakLWr/XXmlSQyaqfT5+7iox2eWumJfxHuTnFB6snjxU8vxVcsbi5RfrSeqPxjyNvAxz/EWEL8zqKQ== Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/speexdec: Check channels > 2 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 6yrTWBpKw4/H More than 2 channels seems unsupported, the code seems to just output empty extra channels Fixes: Timeout Fixes: 51569/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SPEEX_fuzzer-5511509165342720 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/speexdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c index 9793d939fcb..08c7e77e7d5 100644 --- a/libavcodec/speexdec.c +++ b/libavcodec/speexdec.c @@ -1452,7 +1452,7 @@ static av_cold int speex_decode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; s->nb_channels = avctx->ch_layout.nb_channels; - if (s->nb_channels <= 0) + if (s->nb_channels <= 0 || s->nb_channels > 2) return AVERROR_INVALIDDATA; switch (s->rate) { From patchwork Thu Sep 29 23:09:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 38469 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1319711pzh; Thu, 29 Sep 2022 16:09:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM79UhOlgwPfaxvksyc7Zz61d0wEJVpitgjXM43FlvkaYj9dIojYXgzepS7StVDyrA++ycbF X-Received: by 2002:a17:906:db03:b0:741:337e:3600 with SMTP id xj3-20020a170906db0300b00741337e3600mr4548051ejb.343.1664492980506; Thu, 29 Sep 2022 16:09:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664492980; cv=none; d=google.com; s=arc-20160816; b=M4GlrE/jFs1S80g6AuzjdMkFyqKTzxAM8VYZGuSZ6vYX7KDK9XXP0+k4YWeQk7R0Jm fdMjmIckhwSW3lzJbkUmv0lVmhPFcBxtI5NjuVOM+y26kXwrT/AIpX9Bfz8rfj5Dblw9 5nDBdcpvytKXx2GyI0kksjxXFeh4TH6n657J9RGGk4wXTssrgd0YS+n3XbB/rxc7DTuK GPpA+gvSc+hh0m841Nz4Nbzwb1QjALFG4HBDzULUmuOEeD65rgxNqHCIuixlSVb54+xc ShkZE3mnHEMOwWlidUdwmjPX7wBwrBMdRj1UTcQfRfcIYP66k7VUreO4ITfaB7sNMfEu mkVg== 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; bh=qJbqTuQ9rRDDzg/r4p1EYSDg5kYQfAEYumBMmGU/PEU=; b=ZQxdT0FzDch7QQHHysicDsgfz9sc2MqVwbr1GAEcBWz1u3OL5rPdQYuhhQeZzT+PqB /VUQNdp+X23XFplhJAKj6rcuFXz5At/87+sQP5LFmBNuC/IuNXM9Tx7a5/7tZFl0sg5Q ifeAJfoXFMc85TzstYmdU6wAYnRfkJD/jvTdSiQzsVhOC4sPyiKlZDLCvVNEUeTZdHhZ MX4rcI/Y4bvyo3vTD4n+dajVR284mPGrF5wCiSIAkbB5p+zjPK4McUcjtNEDTSLZZF8t l8tZghT7z1YRDOZhRELHw8w/5lGeumAfNzawAExKiVpGQEClE89zhJnP/4gHmlu/E9Cz W6Sg== 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 dm10-20020a170907948a00b00783645da4e5si404522ejc.582.2022.09.29.16.09.39; Thu, 29 Sep 2022 16:09:40 -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 6845368BB63; Fri, 30 Sep 2022 02:09:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D4D168B9EF for ; Fri, 30 Sep 2022 02:09:30 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oe2en-00FoIe-6z for ffmpeg-devel@ffmpeg.org; Fri, 30 Sep 2022 01:09:29 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id e2b6oUHpr8s8Ue2eno48s2; Fri, 30 Sep 2022 01:09:29 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id e2enoJ04bbZLDe2enoYG98; Fri, 30 Sep 2022 01:09:29 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=Ufwy9IeN c=1 sm=1 tr=0 ts=633625a9 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=ZgIfr3Eg_3Kr9YytetQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 30 Sep 2022 01:09:27 +0200 Message-Id: <20220929230927.28439-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220929230927.28439-1-michael@niedermayer.cc> References: <20220929230927.28439-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfIm1ZQDegAzjS74QFBBxuDuHwRutXmzplDfZ/cO2JfrCeaNat9cSXf41Smf5aLfj0E+US5Yx9TW1r3R1Cfqp3Dj21/coazfSsG1mtow3WWyJkBJIp8BW XqFNiuKqmjkIBUaGlmIQ0yvCvI4GWBs6fthjTKa+9sYmWaA+bS2/L6iEsICPPDPE89jTyzCo1O5XJw== Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/mlpdec: add max channels check X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: cwk5oRlBpuq3 Fixes: out of array access Fixes: 51648/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEHD_fuzzer-4644322217164800 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mlpdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 635f92895c5..0b0eb759901 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -547,6 +547,9 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, return AVERROR_PATCHWELCOME; } + if (max_channel + 1 > MAX_CHANNELS || max_channel + 1 < min_channel) + return AVERROR_INVALIDDATA; + s->min_channel = min_channel; s->max_channel = max_channel; s->coded_channels = ((1LL << (max_channel - min_channel + 1)) - 1) << min_channel;