From patchwork Sat Mar 12 23:52: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: 34717 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp991288nkb; Sat, 12 Mar 2022 15:54:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJwBRreSAZOKpk5yvp5BXL8SY6Ld0xy/xdKRVFlJg1nS91vwMsEyrolnYU/aJ/mOIOqeligy X-Received: by 2002:a05:6402:1590:b0:416:3524:1f5a with SMTP id c16-20020a056402159000b0041635241f5amr14337306edv.391.1647129292355; Sat, 12 Mar 2022 15:54:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647129292; cv=none; d=google.com; s=arc-20160816; b=XhkVjSmlzPj8n8ZnyF9yXlqtRETz8nE30X5hPHLu2YXNED/tujr33KGZdJTN6eKsdU 4D3n67KGnCEeO3trnX8tL0/85rm5LU5hDp+WT6gtIeKnsiNZto/F4Z8EMeIB7uiFDUAs XUXgQYjaXIMJazTT27yIrknYFbKUG8ltiIj5IO65DY9TN+PrF60Ypeq68Aq5KllNhQtT Vezg0Lsh6CJo6+MpYhP6SYSIWYHJw9f6S4SISqYP/uePuMeEv03n999cCbdH0LevXvak gLUzJQ4fJCfpIl2s8DWnah6rdwFjvTZNMCeq0x6KjbcHN/xuKfJBJuMAuNC1OHun7/bX Yhiw== 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=/mdjeJ+C5KRURB9mzpsARuT/aZkBZX2gtWNOvWfi8QQ=; b=CxUrRedO4+SLL4jVHDLi64Qr9RadrLHupKEtT2ir03Ts9S/T9Wy/22Wciy8hHsPrKx +L/U19aJbbv/Y0A54huFAnkrrufZI+GjnY0xEDG+8hCsthfR4IyG4LaOSNu4Wq6znFqf egZG+YPaUgC4axxSNGNR1xAg+ndadHGwxeAyiMq/CECaSMBXyghYYXSCuuoKUWvswKIp 22tLJtnGf9cLgv+kMzN77kkCRADlgW+qBxnbR8xztuPq2I6U3lAS7TDGfMSPww7kFkVO 0IW53X5tDTZDl3smdNls+ujoDjnjgQShYUnr1+xPtE2V663YXP4ilduzvN2RIoJQNXK+ 7N1A== 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 u22-20020a170906125600b006cfec4c6e33si6882692eja.64.2022.03.12.15.54.52; Sat, 12 Mar 2022 15:54:52 -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 2680268A962; Sun, 13 Mar 2022 01:54: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 (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 572BA68807F for ; Sun, 13 Mar 2022 01:54: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 1nTBZL-000381-0G for ffmpeg-devel@ffmpeg.org; Sun, 13 Mar 2022 00:54:43 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id TBYNnKmMZSgGFTBYNn2xdA; Sun, 13 Mar 2022 00:53:43 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id TBXAnu2mdOPqFTBXAnBuwy; 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=OcX7sjfY 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=MvdBuqeq2cUPjsrB6X8A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 13 Mar 2022 00:52:25 +0100 Message-Id: <20220312235227.19626-2-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: MS4wfClUmHkzJA0O4bO65lRWcde1T6QZCHWLMvNu8x+cve2FR9D0Ls5vnFecRENuFcwqZHYuVdy3gSL1wqxh8h2kg8FDBNQhm6VlL3blwz4kfVeNDV7Ih/zq rUJrYjtfu1pY7tr50M0O256I5ZgACSn1gkgm/t+auJ52uQkw2B3Q8pc+lpDj8UmpyASZUg6OWiGqnA== Subject: [FFmpeg-devel] [PATCH 2/4] avformat/mxfdec: Check count 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: m3S9hiS2IOHM 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 b85c10bf19..d7cdd22c8a 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -932,7 +932,13 @@ 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) { - *count = avio_rb32(pb); + unsigned c = avio_rb32(pb); + + //avio_read() used int + if (c > INT_MAX / sizeof(UID)) + return AVERROR_PATCHWELCOME; + *count = c; + av_free(*refs); *refs = av_calloc(*count, sizeof(UID)); if (!*refs) {