From patchwork Sat Mar 12 23:52:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34720 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp991336nkb; Sat, 12 Mar 2022 15:54:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJyGYWBor/OK2vXvvmPJC07lWwTdwbERou7oEImpbBsWVQnT6pEWT8rfJPEjb2KO6PcRcIHi X-Received: by 2002:a17:906:a1a:b0:6cf:d2d9:410c with SMTP id w26-20020a1709060a1a00b006cfd2d9410cmr14056053ejf.713.1647129299819; Sat, 12 Mar 2022 15:54:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647129299; cv=none; d=google.com; s=arc-20160816; b=WIdbYaZ8rgC9am7zCmOcmrpX8Lu9tX+phQ/X6VrKcn/t0PxJlp0JczvNre7iDZEIV5 fbPamgQ+tGSjY/3NOsxM6kot6AszY1nURRTbYbvj9oxZQhHSyR+90UyhawOyFGvp+0oQ p56GTO6p/Tf9ZEbdK7Txk2j5RvUl/dXbOOSnf3mFLSnUaQAWeBrv/XhAXYjn4ZENzFGd VqUOOVJ/BRHSm8b9xYp1259tbVdGWnFOvX2LWmm/zlAZdhUon1gOEJaG5+kJOIdp++fV VCdehe98IceqZ7xLZPQz+UxMBNIJfZn2RH+JbvMotnp98jYzJdKYfofWDvvCnwvgj59i H+Cg== 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=uhQGwXbLhGZR0J9S6oGsyy7B2h1ilzdanloWZSjodFQ=; b=dETTzzFhucLLUiFNke+jilZ9q+DHRgLRlmF5PdlfBo6+5t9DOa+8Txgy1Uv8pkknAU 7pXVhf7EnLcRMBacCEjs5jiKqkv8+8Y4D5+71Dlhxn4ran+ACV3C76o8LsJBbUfufgG6 FEgB3MqXem1iKY/hISGsuGexhfxeAj14g/lY2vs0bpN4TDynfuxS9lGaY1VLXpmerLRt a85deBjfPgdY+VY+DE5OlTWzUoVz2XXooAV7OSfDmqXbh9SLwsQakct2tFv5tGrc7/DN Se6Wk5OJLgWmjfSy9F1VpV1iE3HQGrhNJf1xW8j4F5Io0g8OpoxIYcCVMFyXQqy+9C8l 72oQ== 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 f21-20020a05640214d500b004162353adf5si7132498edx.152.2022.03.12.15.54.59; Sat, 12 Mar 2022 15:54:59 -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 1A56F68B1BB; Sun, 13 Mar 2022 01:54:51 +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 8E04868807F 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-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nTBZL-005jbN-0J 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 TBYNnKmMaSgGFTBYNn2xd8; Sun, 13 Mar 2022 00:53:43 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id TBX9nu2mUOPqFTBX9nBuww; Sun, 13 Mar 2022 00:52:27 +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=NEAV23lmAAAA:8 a=sjAuraTEZ6yCOswiwBcA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 13 Mar 2022 00:52:24 +0100 Message-Id: <20220312235227.19626-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfClUmHkzJA0O4bO65lRWcde1T6QZCHWLMvNu8x+cve2FR9D0Ls5vnFecRENuFcwqZHYuVdy3gSL1wqxh8h2kg8FDBNQhm6VlL3blwz4kfVeNDV7Ih/zq rUJrYjtfu1pY7tr50M0O256I5ZgACSn1gkgm/t+auJ52uQkw2B3Q8pc+lpDj8UmpyASZUg6OWiGqnA== Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/vp9_superframe_split_bsf: Check in size 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: AvBi+59CbbAj Fixes: Out of array read Fixes: 45137/clusterfuzz-testcase-minimized-ffmpeg_BSF_VP9_SUPERFRAME_SPLIT_fuzzer-4984270639202304 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vp9_superframe_split_bsf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/vp9_superframe_split_bsf.c b/libavcodec/vp9_superframe_split_bsf.c index ed0444561a..6af555c078 100644 --- a/libavcodec/vp9_superframe_split_bsf.c +++ b/libavcodec/vp9_superframe_split_bsf.c @@ -51,6 +51,11 @@ static int vp9_superframe_split_filter(AVBSFContext *ctx, AVPacket *out) return ret; in = s->buffer_pkt; + if (in->size == 0) { + ret = AVERROR_INVALIDDATA; + goto fail; + } + marker = in->data[in->size - 1]; if ((marker & 0xe0) == 0xc0) { int length_size = 1 + ((marker >> 3) & 0x3); 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) { 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; } From patchwork Sat Mar 12 23:52:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34719 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp990904nkb; Sat, 12 Mar 2022 15:53:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJz8sRlNPOMm4uEIytyVDf62glNzSg60e/fA/B7WI1hux3AAJ3X5bAR1BzONOFEAStirPnef X-Received: by 2002:a17:906:c092:b0:6cd:f3a1:a11e with SMTP id f18-20020a170906c09200b006cdf3a1a11emr13474240ejz.185.1647129232269; Sat, 12 Mar 2022 15:53:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647129232; cv=none; d=google.com; s=arc-20160816; b=bUWXYEu6znjF6iHSP+bGtI3sAffL1ZsIaxMceuoVkoA/MGwAg/EXMo7fI0axxs7gqi RCX2G9CEiBg5EDMjj6daocwRvqxIoIomGdXk0sTNRFpkHOfLybwREa9Lo70Mhh+mJhqx dNd3kXpwKtKA7j883xAgD+FnfCSV8aSEi18w8tRMoo8BPYrxlrpuM9R/dh6Ub3bxYbVJ llYweIjWbwMgKEH/d0c4l8b0l0FfLhvtDK74FVUidlAGs9pfIHCWoi7Eoa/odkxY1FRC cQTkBR9/sjrxvUBDftWdNOzVQlAe0KMf21Pg/ku56k1/wSCbEVM6NHiOMBlRgg9DhKqA uQcA== 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=EiSEXdxvwSed5SaZlh2JxVWolUtGku+b61r2QBEUqII=; b=WSE6CPDj94AtDBSERdZ2lU1M0cFbm6Ye/NrdHAQ263OsQsMepFKflr6gqlIogs1w1y yA9t3MD0HzR8LcYUrFMJ4/urKjhiloD/xHbvdD56ytuunPT18UZp5G9U5PXshy8STdAs p3TNb8MfsoTaF5y5EeCnGOzSZJwgHypdekgfD5XX3p7N7a5jN0i3eNk2APQXkOm/3CiV klwOMRalNApF+0w01+rvwzX+/poAAyDoYsSNxJeYQjXz90Abab23KMuToGXOsPZs9mCf /eLh1eZP7dXUEyLNVw5+fyG7yEjwwBogkSJE+NLOeFpJnIBAWu6p/EOiyMKMv/5+Ar/R 7GsA== 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 18-20020a170906311200b006d62ccbbddcsi7052859ejx.1001.2022.03.12.15.53.52; Sat, 12 Mar 2022 15:53: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 16BAA68B1AE; Sun, 13 Mar 2022 01:53: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 85A6368807F for ; Sun, 13 Mar 2022 01:53: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 1nTBYN-000381-1L for ffmpeg-devel@ffmpeg.org; Sun, 13 Mar 2022 00:53:43 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id TBYNnKmMbSgGFTBYNn2xd9; Sun, 13 Mar 2022 00:53:43 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id TBXAnu2mkOPqFTBXAnBux0; 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:27 +0100 Message-Id: <20220312235227.19626-4-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 4/4] avformat/mxfdec: Do not clear array in mxf_read_strong_ref_array() before writing 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: OFZTvR9hUFhC Signed-off-by: Michael Niedermayer --- libavformat/mxfdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 828fc0f9f1..f088712494 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -941,7 +941,7 @@ static int mxf_read_strong_ref_array(AVIOContext *pb, UID **refs, int *count) *count = c; av_free(*refs); - *refs = av_calloc(*count, sizeof(UID)); + *refs = av_malloc(*count * sizeof(UID)); if (!*refs) { *count = 0; return AVERROR(ENOMEM);