From patchwork Wed Feb 23 23:50:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34498 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1318650nkx; Wed, 23 Feb 2022 15:51:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJy4lSy7QTq1ikZiKXJUFZmvf8/8CQHc4+Ljfra2dqxIlMD5rGZpWk/pyfeFIPUuWwrVsLNM X-Received: by 2002:aa7:d8d8:0:b0:3f5:9041:2450 with SMTP id k24-20020aa7d8d8000000b003f590412450mr6289eds.322.1645660285900; Wed, 23 Feb 2022 15:51:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645660285; cv=none; d=google.com; s=arc-20160816; b=yjVA5IF7ZMEgotenNQCQRYQLlMP+nn75wHpEizwaKjomVWHEd1OOSgNsl9XWw9MU03 owP+IsCNo8qCsIUPuNFLfNvFCT0ZOig6rbOV8VBu6hbxdZo+K0kTMaAZyFcWN8lUCNPP OSgnVYlcaX6dpUS93daLW0LEHzs09rXXIHhNDWFO8JskIEUHiJMATElPcsl4fI7oxhiI bSOILsqu/z5E+s+oGru0WAvmohP1ts6rG6oNoAi9mXCwx8iFPf5kWsUfCNd0mQ5hJtis cyH+ixZ8oBp4/Gab02quUIEn71NWycNY5gAVH+ptlos3zZhWYeqoHXzgIbkPGPJKRuSY AU6A== 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=tNYLPP8Q6LAzCYcJA8wkdTbbDNh65/Z9b7+StIZIpZs=; b=V+3aWbQ12sobL3YQ/qCBGTyGzLf1H93cl/pCT9g3x9I4ZcT8Ae0+3xN27poUjU5C44 bR60H1IlOsGmmuWwuLpcM/op8zsOSKl3GhesdkpFTKoa/rKYIwU8vstdyjiuPWWocUyK zeV6BYNTangR7Rld1X1nGfA0z93+O+tyRaBQ0hS6JL6g7XZN/oxpzE22LSJGCCXpg4pz Gb7lbw0CPC/B0GoOMFV+0A9ImANPrIxSpPRg2KIhT8J4B/OLYD67ekRUGZJh/PVHWfQE ALUjHg9FzkdTe5u8hZfP+9vqw3IXjb66Cjvf9dNvM6T2vG6zeXQGza0wsyX1uYy8cpSK DZSw== 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 r25si591828ejc.298.2022.02.23.15.51.24; Wed, 23 Feb 2022 15:51:25 -0800 (PST) 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 BC79D68B20D; Thu, 24 Feb 2022 01:51:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-1.mx.upcmail.net (vie01a-dmta-at01-1.mx.upcmail.net [62.179.121.145]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DDF768B0A6 for ; Thu, 24 Feb 2022 01:51:14 +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 1nN1Pd-00GQ4N-7I for ffmpeg-devel@ffmpeg.org; Thu, 24 Feb 2022 00:51:13 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id N1PdnxIY6SgGFN1PdnLN1R; Thu, 24 Feb 2022 00:51:13 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id N1POnwDPWfYHNN1POnvRta; Thu, 24 Feb 2022 00:50:58 +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=MrIxV0We c=1 sm=1 tr=0 ts=6216c870 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=OH40NqmpHbHgRPRqmhEA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 24 Feb 2022 00:50:57 +0100 Message-Id: <20220223235057.24625-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220223235057.24625-1-michael@niedermayer.cc> References: <20220223235057.24625-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfDP5pLwb8sjkdHiYNBtgODtzxIjMo6om9VyKW2aLxcLwvs3596PpS22ENId1i9K/ufPvw8nwsXvNxlwaQoVMbHdkw+fNFIOkNg9Rjb8wmqR5ET8aMOaO IkO3u5xREBzGrUnenOAGCXrXFxhsPms4p5sxVB8v37LRBnJsa0e5Asw66QwzLVeb59qkHQtN+hPf6Q== Subject: [FFmpeg-devel] [PATCH 3/3] avformat/rmdec: Better duplicate tags 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: RMQCWGpJ/1MC Fixes: memleaks Fixes: 44810/clusterfuzz-testcase-minimized-ffmpeg_dem_IVR_fuzzer-5619494647627776 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/rmdec.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 3a3f6aaf09..b0a38bee83 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -127,10 +127,6 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVIOContext *pb, uint32_t version; int ret; - // Duplicate tags - if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) - return AVERROR_INVALIDDATA; - /* ra type header */ version = avio_rb16(pb); /* version */ if (version == 3) { @@ -330,6 +326,11 @@ int ff_rm_read_mdpr_codecdata(AVFormatContext *s, AVIOContext *pb, if (codec_data_size == 0) return 0; + // Duplicate tags + if ( st->codecpar->codec_type != AVMEDIA_TYPE_UNKNOWN + && st->codecpar->codec_type != AVMEDIA_TYPE_DATA) + return AVERROR_INVALIDDATA; + avpriv_set_pts_info(st, 64, 1, 1000); codec_pos = avio_tell(pb); v = avio_rb32(pb);