From patchwork Sat Mar 12 23:52: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: 34718 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp990589nkb; Sat, 12 Mar 2022 15:52:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJzwZwLA9U2o80CBAIM75pTBXLMSZ7cNEeQ6jsbHXYKrN/h0C567gwwz1Yq1taE6w4vwNLAH X-Received: by 2002:a17:906:3117:b0:6cd:f81b:e295 with SMTP id 23-20020a170906311700b006cdf81be295mr13198792ejx.511.1647129175311; Sat, 12 Mar 2022 15:52:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647129175; cv=none; d=google.com; s=arc-20160816; b=JcnCjg+2Jj6xqlpTlc7Ol7+8QiZ+zQibD7mBCVqoHbUmilakVrL5WLvJu0RD+1Z34u htZmlFl57YiaawsLfYDNf6gP7jEeQ1o+lxPX9zBCTbpUTGliVFXB9oWqR+H+ttSJAZnn NPgUqu1+Z6M2xWpBJJcCqcmoEqPPzvtGQnWEZX7jg55GZ+QWk1TvyEr2H+Z5BfUUXJPJ GLOSfDKcFqTYMLu8ejmpVStsxrUMVWgaOakrlFOQEUiCNHGX/Tp9u5Oa7vpog8LoHagD pbVMhukGXpGIoXNYrxmW6vhMBjN+w+VcGbJS81p0Sy3Sg5d3PvPAEJDn9goon9tj+QER CLDw== 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=yUWSBovlPUayL7NqM/m5fVPJQw3QN0GfxMK0I/jtf7A=; b=xZybKFT4Ppq6x4SYybghtBjfFXH/ArFfmmudB+Vj/scXfxyxcuwGD9lbO0tUpzNBGq Ifp4lfIKS33lkLOvYzwTh6q/pXYcW5mt8NBSZwbPLcBVwsjkK5XoPkwsrq0LrKOON2Ev QmEC6P95nbLba5Kc9zEdfTHOtTU4uHUma4Kxa5c8jmjMZnq5tkHLlwhGP//Q2KIsgv2j LZ/EEp1QKNFn3scjU7FM9VW/nz3oxO+b78sac1mGlKcOjW0XqSI/ZY5G07CkJyFlVXqU mlHnv1YqGCnsjNvaK/HHhlfEWE+Gv6e0i9tlpnv6W3hTbtpY58DNcP7/0nj3eF3HaP4W YuMw== 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 w2-20020a1709067c8200b006d0876dbdd7si6863912ejo.687.2022.03.12.15.52.54; Sat, 12 Mar 2022 15:52:55 -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 E7AA168A962; Sun, 13 Mar 2022 01:52:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (unknown [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5B5F68A962 for ; Sun, 13 Mar 2022 01:52:43 +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 1nTBXP-000381-7g for ffmpeg-devel@ffmpeg.org; Sun, 13 Mar 2022 00:52:43 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id TBXPnKlDNSgGFTBXPn2xa6; Sun, 13 Mar 2022 00:52:43 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id TBXAnzGJJfYHNTBXAnB3cD; Sun, 13 Mar 2022 00:52:28 +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=622d324a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=5qjNtTWC_UPmtnd7hHMA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 13 Mar 2022 00:52:26 +0100 Message-Id: <20220312235227.19626-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220312235227.19626-1-michael@niedermayer.cc> References: <20220312235227.19626-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfMXMANKZN/18BqNkPr4h6xE4t/RP0uRj7iado39SO6jljDuiBYYP8jlS+XuuKPJO+LXlDCK93xfmtG9NhdjXhSjYUK1Sn2FTjDZXHXikthYGibj1nIUy GKwDKQ/z/UkUg+9bfEjAuahTQ/BljWBjfZrMBgZt5MYhB8KC7hQ5g70ZxKYu4U2Cdb80+Grb4WIsRg== Subject: [FFmpeg-devel] [PATCH 3/4] avformat/mxfdec: Check for avio_read() failure in mxf_read_strong_ref_array() 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: JeR6ECI8kkeI Signed-off-by: Michael Niedermayer --- libavformat/mxfdec.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index d7cdd22c8a..828fc0f9f1 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -932,6 +932,7 @@ static int mxf_read_cryptographic_context(void *arg, AVIOContext *pb, int tag, i static int mxf_read_strong_ref_array(AVIOContext *pb, UID **refs, int *count) { + int64_t ret; unsigned c = avio_rb32(pb); //avio_read() used int @@ -946,7 +947,12 @@ static int mxf_read_strong_ref_array(AVIOContext *pb, UID **refs, int *count) return AVERROR(ENOMEM); } avio_skip(pb, 4); /* useless size of objects, always 16 according to specs */ - avio_read(pb, (uint8_t *)*refs, *count * sizeof(UID)); + ret = avio_read(pb, (uint8_t *)*refs, *count * sizeof(UID)); + if (ret != *count * sizeof(UID)) { + *count = ret < 0 ? 0 : ret / sizeof(UID); + return ret < 0 ? ret : AVERROR_INVALIDDATA; + } + return 0; }