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); } }