From patchwork Sun Mar 20 13:47:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34858 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp921100nkc; Sun, 20 Mar 2022 06:48:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz21HML2MNwGrX0JYkNJEDTIweL40GDA3fhnsC7pgo+xtEQYErtPPF/2ynsW7jLl60aitrF X-Received: by 2002:a17:907:6e29:b0:6df:dc30:575b with SMTP id sd41-20020a1709076e2900b006dfdc30575bmr5379727ejc.510.1647784098806; Sun, 20 Mar 2022 06:48:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647784098; cv=none; d=google.com; s=arc-20160816; b=sRQDPdjeiJizY9A9E0GqXpsIbDtckemSrxxev4PhwuIiBVjg3NHR1M+CBp30KuxGYR asfI6vkV5wASoVG9Blq37EftKOPguZHrfdSg/cPjl/p824M7VJfd9z/y24/45fKN04SH YT8JoFEn3f1MnUwpqEwNh9Yc1mSmgM5ielyWiHj5VevK6BTUBUV3NbFx5fi84fihxXwG eNjIKauieLdCj4fWGXo64P822V4KcmBOCjHQ2g9QxiBpqoO0vTmTlKX+3rWbTKNGrcuR DAxeGqBdgKJpNDTDiwe5m+jyWnH0sSJuZgMunf8Wl7D1WAV/CR5fSdTk05NkcXukGtTr N78g== 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=JaDy4a/mhNqEJiGu7wVq4dUkDGdiZgfRGYrQuZiCeco=; b=WWd85uSHCV0n4Re48KV4c5bi+Vj8y7041ow2RewS2IBp+av4EcyEmygXtTCtFl81ee 6dmXe6OC5CbkQZo7p3xbV3X6ENETs90kJP9hJldDISlZdS7BOxYaVVdizAwf4Cz2wQHL n42s58m3UeLW2WHmMZhSQvZlCx4ZJP832Cz2doAsPzYiOXWJywQwwqWjvFaomhNDH9XC QqXIShDdpCurqvPmeWHI2XgagY0dv8Cw+/qYy1fH74Il49c8QrESxN7JnGxyWLk6K97B LiEgv0rG4QxIA0MtuGaGjaL/Tebqkwk31bi1z40TN3rH2TidRXgrhG0MrR3WanGQi8Q0 GRXQ== 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 ky19-20020a170907779300b006df76385c53si5012741ejc.243.2022.03.20.06.48.18; Sun, 20 Mar 2022 06:48:18 -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 D997768B0A2; Sun, 20 Mar 2022 15:48:04 +0200 (EET) 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 99BF568A8A0 for ; Sun, 20 Mar 2022 15:47:56 +0200 (EET) 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 1nVvuV-0000Ux-Av for ffmpeg-devel@ffmpeg.org; Sun, 20 Mar 2022 14:47:55 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id VvuVn41RMSgGFVvuVnIFPx; Sun, 20 Mar 2022 14:47:55 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id VvuFnKFJ9OPqFVvuFnIY5i; Sun, 20 Mar 2022 14:47:39 +0100 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=OcX7sjfY c=1 sm=1 tr=0 ts=6237308a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=apxm4mY1AWi8j9N8YjIA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 20 Mar 2022 14:47:36 +0100 Message-Id: <20220320134739.28728-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfAXKuwCyoSIvLc4G215X8hXCUUjJQwIHfTjBVSlVTjuSH9n1DoXT/kaBdxOiIGXHMmUtTNdxx0xL1i67/5BQWgr2INAHP8kUkdZkyEoYOhMPxwGD7MXQ InJ4WseqLFybR0iBORTjBclLK9ngRB23QrYeqB2k+LC3dxnePFlb3f11iyRH7G5nNxp03DsonaQauA== Subject: [FFmpeg-devel] [PATCH 1/4] avformat/alp: Check num_channels 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: JRWlk7Q8/Ntk Fixes: division by 0 Fixes: 45615/clusterfuzz-testcase-minimized-ffmpeg_dem_ALP_fuzzer-582660348405350 Fixes: 45625/clusterfuzz-testcase-minimized-ffmpeg_dem_ALP_fuzzer-4821437943250944 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/alp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/alp.c b/libavformat/alp.c index f2428a9e3b..40e4890a38 100644 --- a/libavformat/alp.c +++ b/libavformat/alp.c @@ -122,7 +122,7 @@ static int alp_read_header(AVFormatContext *s) par->format = AV_SAMPLE_FMT_S16; par->sample_rate = hdr->sample_rate; - if (hdr->num_channels > 2) + if (hdr->num_channels > 2 || hdr->num_channels == 0) return AVERROR_INVALIDDATA; av_channel_layout_default(&par->ch_layout, hdr->num_channels); From patchwork Sun Mar 20 13:47:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34857 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp921060nkc; Sun, 20 Mar 2022 06:48:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxs3q19yY/WfHENIY4YZy+Vol7wE7RRdsmO+IWXK0Ap3Cf4NK7vTeeTtQR4jW34zhDDKvJ8 X-Received: by 2002:a50:9fad:0:b0:419:f22:46db with SMTP id c42-20020a509fad000000b004190f2246dbmr11502439edf.354.1647784091045; Sun, 20 Mar 2022 06:48:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647784091; cv=none; d=google.com; s=arc-20160816; b=lCqwq9F13JcLC/0V2pMm0WfvjyH3aZgNsYRvlRuJ8Teai5doj7Y9rvvuconzVg9VIv 6Fzw586TsMWDgxW+5KiE4UD+JgKPPnmOLXAYDaAYDM6e96rD97LpPylJazITeJ99Z5WR MiaIKelp6OcqHsuocybXpviOYypO9fVp4dgDPDtnCm3OjHjk2Kz7T6f9h6KNkiamxosv CHNYginhZeDmGTrXCnKbG7DgiRZP3Y1kiE/rGrWuotnqSYcWPRgCuxLUQf8Gq9BxIiHY O8EUSSwWr6qP3RF6KDVi9aPruHCnSuFV6GQs13fudfOO2P48/me4lpROU/7ewKQezBt/ perw== 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=tv8Qb9bMBZnfZOglIeT3C1lCBylDv2XsBvYf7zdV7AY=; b=Jp6OPhPCXHrfuJlWIOcklQbv66cFPld/bZLqqvoVbfzz+ox/OyXpCFYfeXi5TE6r5E cSxWaBj4lYqT5I1lTo1/Z4dB8HHgg6LXNxt8CUAUu58nmTOJGDrTa8ePS/7FUd7kSIAb 4i7eVEZoXCslW9OcAmBLQqQoypBmIU6OJ4gGCkgUb3LwIBMThSv1BRs1TJxRzRyPYKvA a77Uh47CTuIv8pKK00gu5hmVnpIiDW5DKAcUEgsDk0XsNxgVAaFltrFMBR8WjMTkNxw8 DpYXJ4MSLX7e1tYWnVUtFNmp9H9NRnz9M9aSOEbBHesr+7uFIqsX2kEiKaU4PRt5xbaI Ggzw== 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 v29-20020a50d59d000000b00418c2b5be49si7502416edi.299.2022.03.20.06.48.07; Sun, 20 Mar 2022 06:48:11 -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 B837968A7DD; Sun, 20 Mar 2022 15:48:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FB4368A3B7 for ; Sun, 20 Mar 2022 15:47:56 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nVvuV-00FJ7u-B2 for ffmpeg-devel@ffmpeg.org; Sun, 20 Mar 2022 14:47:55 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id VvtWn403ISgGFVvuVnIFPw; Sun, 20 Mar 2022 14:47:55 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id VvuGnKFJPOPqFVvuGnIY5j; Sun, 20 Mar 2022 14:47:40 +0100 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=OcX7sjfY c=1 sm=1 tr=0 ts=6237308a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=7824lMI7JCIaL_V-WYwA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 20 Mar 2022 14:47:37 +0100 Message-Id: <20220320134739.28728-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220320134739.28728-1-michael@niedermayer.cc> References: <20220320134739.28728-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfAXKuwCyoSIvLc4G215X8hXCUUjJQwIHfTjBVSlVTjuSH9n1DoXT/kaBdxOiIGXHMmUtTNdxx0xL1i67/5BQWgr2INAHP8kUkdZkyEoYOhMPxwGD7MXQ InJ4WseqLFybR0iBORTjBclLK9ngRB23QrYeqB2k+LC3dxnePFlb3f11iyRH7G5nNxp03DsonaQauA== Subject: [FFmpeg-devel] [PATCH 2/4] avformat/cafdec: Do not store empty keys in read_info_chunk() 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: UydpZgU7WCsQ Fixes: Timeout Fixes: 45543/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-5684953164152832 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/cafdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c index f0c2c50c59..f6c84e0dae 100644 --- a/libavformat/cafdec.c +++ b/libavformat/cafdec.c @@ -241,6 +241,8 @@ static void read_info_chunk(AVFormatContext *s, int64_t size) char value[1024]; avio_get_str(pb, INT_MAX, key, sizeof(key)); avio_get_str(pb, INT_MAX, value, sizeof(value)); + if (!*key) + continue; av_dict_set(&s->metadata, key, value, 0); } } From patchwork Sun Mar 20 13:47:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34860 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp921408nkc; Sun, 20 Mar 2022 06:49:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfBIKx4418PN6xvbLoDuUw1r1JGBStedO2mnsOcp2HmtbCBHPKCP9fD1mn3q5iv7RQrN/j X-Received: by 2002:a17:906:a08b:b0:6b9:2e20:f139 with SMTP id q11-20020a170906a08b00b006b92e20f139mr17303848ejy.463.1647784145745; Sun, 20 Mar 2022 06:49:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647784145; cv=none; d=google.com; s=arc-20160816; b=RQAwi3PLtvfcX2vL5BOgm7sNI5SEaYxOmHx5bD6+SJZDyO0N8n8SldbIZ96NvLA5jO DKRMO0mt/N85N1IK7WnM1V5Wq8JPZRZRpHQxGHALBmIg/RkJh96x1InD5+mvfEICOkIR qT5tJjJpuYaHMCTpcqYBxTUyTJUt3rplzxFoQueo7hcFS9NTj+wBDOoXqO5D6qIlkcDq zmAtQYAAqpArw3Cz22NV+ShG0C/i2RBZbVyZmMSh+7ud0MrZUC7cXShjHsZDc0+oqXlH rETHpHAgagZ7aVZsj9XjaJ7fUj5mRD4zAh8BOTUyw8m//aksUA2rMNkMHVb0xQb7RGVK /eBg== 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=7QnSk0Sm38hH+uY9SGliYcyIJADuZZcwNiaUlTSyAD0=; b=KG+ZiA8ZQzWDihbRDus5jjuYTaq3gCJ8H1EB2CAumskAZoId3qWIDVf5jDnJp4/dsf Upvp2lIRGjPFk6hXDIO4hzQ+HeU4TpOtRoBspG4bNRmtGr6eBFsIfDn3p/vw/IcQY2X5 O3gP4oee/ehyPZQrOzpkxOQOSMXK9URiuJu1wvZkCo07To7tDU3mmXztPo53wyx6diTn wILuVyk6WzJHZZW2XaXYtKaSGl90p6/+3EKc5sH5cgWO62lXOFxXr8svOvfd8s5kj/Hl 2lEyKbGIj3wD7JlShhyybVY1ZlQxPFWv6Di8KRdQy/qGgrXqUJP+ymP/NLKlDPylAwzy NANA== 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 fb15-20020a1709073a0f00b006df7a784b52si4451957ejc.508.2022.03.20.06.49.04; Sun, 20 Mar 2022 06:49:05 -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 1023368B050; Sun, 20 Mar 2022 15:49:02 +0200 (EET) 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 5C50B68A76A for ; Sun, 20 Mar 2022 15:48:55 +0200 (EET) 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 1nVvvT-0000Ux-0m for ffmpeg-devel@ffmpeg.org; Sun, 20 Mar 2022 14:48:55 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id VvtSn3zxHSgGFVvvTnIFU6; Sun, 20 Mar 2022 14:48:55 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id VvuGnXbpG8eSWVvuGnwTmf; Sun, 20 Mar 2022 14:47:40 +0100 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=KKE5sHJo c=1 sm=1 tr=0 ts=6237308b a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=oWKpL2fnmQ2JKmIv1KcA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 20 Mar 2022 14:47:38 +0100 Message-Id: <20220320134739.28728-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220320134739.28728-1-michael@niedermayer.cc> References: <20220320134739.28728-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfL+mVzQGbb5+umGNCfkc0KKFB1IFnfVwiDbK1N5YXNfRHxo/QubkD6nwIeET/pXOmL+EiM3PCLrRRaLOxSiYjcUJtjN6vL8en6X4Gs5cfg7DEg+N00Ps mQMBKfcrwa7c5sxF5FJY0MLbm2lGA3/Pm6081l8JMxtcHgFY1tboSw/Xz0cHPTnazbV3Rx/DjbCfGg== Subject: [FFmpeg-devel] [PATCH 3/4] avformat/apm: Check channels 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: sUNdoi9zY7JN Fixes: division by 0 Fixes: 45643/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-4957777905188864.fuzz Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/apm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/apm.c b/libavformat/apm.c index 91eea86a57..baf7d2f941 100644 --- a/libavformat/apm.c +++ b/libavformat/apm.c @@ -140,7 +140,7 @@ static int apm_read_header(AVFormatContext *s) if (par->bits_per_coded_sample != 4) return AVERROR_INVALIDDATA; - if (channels > 2) + if (channels > 2 || channels == 0) return AVERROR_INVALIDDATA; av_channel_layout_default(&par->ch_layout, channels); From patchwork Sun Mar 20 13:47:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34859 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp921155nkc; Sun, 20 Mar 2022 06:48:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzA+0z/FWnU+UvyEvUF4XLl6RqVzI2zC4pB91ozMg83Luc1fLgyVZ7hCSz00tzVUknwT6Gk X-Received: by 2002:a50:ec0c:0:b0:418:f415:6bfe with SMTP id g12-20020a50ec0c000000b00418f4156bfemr18450334edr.15.1647784107887; Sun, 20 Mar 2022 06:48:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647784107; cv=none; d=google.com; s=arc-20160816; b=rTd2cGGa0ViZrElap71fS+9gfMmVxtQFvETkeBVjj+t4g7fzE9+lDHMQQGI1UkBEYb Yfk6yGV63lwJC/WT4ynPX+Kb4kCuHRC96A0+TP6F/WqOmtCIaiOcvbXQ1MJBut0Oelbz JNmGShsex6VxRc98aZOpllS+dVXBVEnUVTZ54715LMHV81MpYeW4khiZwGs5L8XT7Bi5 s6apOmEP1d+4tD+QGBS3EUKwOlPBL8pYWP/ck9PiXIfvJJGHbC24J30Zx3Ka1NHR6BWY lhzFP/p82iHLs3f9/viheTxW8tPNAvfgPfPuFtcs9+KF8z0qwDr0pu9BomelpR85xmpz H7EA== 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=bLXcVx2SyRNEiuZRxvP1xRf2XhoRrPghPhzbqoHZJ/E=; b=HRV4aV9ndju+10eklPBLt4UU2Y5ZpQ0qXz0g5p3qtPrZNoXGavi0WFOzS7i0GBScOX 0czkwh7uZhRiPfV5immbB7IEqSKp3TEmo6cvLVshP4DGJwFu2oLxzfgSk56qdD08t5z3 Bxl1ZNRJGGgrjh3y9R17+9qpec+Rku8/UrG1l20AGo9UfFDRTUWeI+zudva3NaQbWJ19 Jlw0n+FtsbEX1ORB0YrgjLEJytRBf8tIJqqmfvwmIpJ3Z30/OnMNHinTj+ykHUKZD2pT cAwCmGUYKaKgX5q8+K1jAexZH483YfF2DjvtBx5QFhjXBWU382gBwZO7wrsKcR1XRRbN spnw== 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 d17-20020a50f691000000b004190767a702si5646374edn.496.2022.03.20.06.48.27; Sun, 20 Mar 2022 06:48: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 E418068B0F6; Sun, 20 Mar 2022 15:48:05 +0200 (EET) 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 9C3FC68AC6D for ; Sun, 20 Mar 2022 15:47:56 +0200 (EET) 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 1nVvuW-0000Ux-0t for ffmpeg-devel@ffmpeg.org; Sun, 20 Mar 2022 14:47:56 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id VvtSn3zxHSgGFVvuWnIFQ0; Sun, 20 Mar 2022 14:47:56 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id VvuGnXbpc8eSWVvuHnwTmg; Sun, 20 Mar 2022 14:47:41 +0100 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=KKE5sHJo c=1 sm=1 tr=0 ts=6237308b a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=2QT74SdOfomLoF6ZHNAA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 20 Mar 2022 14:47:39 +0100 Message-Id: <20220320134739.28728-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220320134739.28728-1-michael@niedermayer.cc> References: <20220320134739.28728-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfCf7l4R+e1f5UyMa/O6HCGFKSLlSSkRecuxQO6HkE4GUbW+ZnkixAA5buB2uCJLrXHWH5kFi0J6LPRUXzL0qFiMb/MnTya4WdBwCWGg4N72a1gGqWVa4 h9cC9XOppu85fw8w0mtBsqEnfYoRvBjjieDG44VXRPVpwJoZ8NUhWZWh53YcSRKskcK/tIwHqsyQGw== Subject: [FFmpeg-devel] [PATCH 4/4] avformat/aqtitledec: Skip unrepresentable durations 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: 0utvOyMWKT8Y Fixes: signed integer overflow: -5 - 9223372036854775807 cannot be represented in type 'long' Fixes: 45665/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-475618463934054 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/aqtitledec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/aqtitledec.c b/libavformat/aqtitledec.c index a37c9bbeaf..6c14b23862 100644 --- a/libavformat/aqtitledec.c +++ b/libavformat/aqtitledec.c @@ -74,7 +74,8 @@ static int aqt_read_header(AVFormatContext *s) new_event = 1; pos = avio_tell(s->pb); if (sub) { - sub->duration = frame - sub->pts; + if (frame >= sub->pts && (uint64_t)frame - sub->pts < INT64_MAX) + sub->duration = frame - sub->pts; sub = NULL; } } else if (*line) {