From patchwork Sun Nov 12 15:11:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ramacher X-Patchwork-Id: 44637 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a5:b0:181:818d:5e7f with SMTP id q37csp836403pzg; Sun, 12 Nov 2023 07:12:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IH5X2uOlWOtwvr2ZW1PtVsUpqP+HYZg+ADBimVkPb0Ip0+RKEFCW6kOLoLkTXjb/l0dRc9J X-Received: by 2002:aa7:c64f:0:b0:545:3a91:3f33 with SMTP id z15-20020aa7c64f000000b005453a913f33mr4242524edr.10.1699801932719; Sun, 12 Nov 2023 07:12:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699801932; cv=none; d=google.com; s=arc-20160816; b=qymJ9rP+CDWE3aW2Of5JoJuEIuFm+uFfIW50FPqNj8txi2FXrV4kILG2Upee83nxsx Lqld1u5AG8sfDFdhRoYwuTSHwglAmsMdqK5TEY4PoYV2ExGRtvoMlgTIJNkkW78I3DvW arF2ZjGBd8B/LU3zWIRozqsgRsKBmHlTeOfGJKeyJgF1jg6qtC7ya456md70N73lV1IS Uu64z+TaXZ5s1irGIUZdcLzDe1uu+0ti7OBj1KqGxsHFm8ww4DcsKCuCVkuXXXUkyzI5 DzBRixoqF+zHJ0r46l9CwxcXJoB0QCnINFuGyZbK9wpSWQNx11AlMr96Wa+PILF01dl5 A0KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=VAXlrDUIKZI8b9IUQWhNmm0PBVua9RONV7/NhMu7NTo=; fh=w39lni1P4BnnoxhBEex6CszENd6FI9kbu5bpw99hC34=; b=tD1LKrLeY87hmo2YjcYvXQ3jw14JJ9qZlwsFTbdk/qSMuS5t0h5wvYkeMoGXSiMRWq L7Llr1OBW9zMBVC07wXMffpE9N5Vd4paekwa66iA7SOqXVa0jLK/rVTVkte4WRCEbZ/z ykSCt3xSFKEIzJUbG7mdVpikE5RflHwS5j/TNdGcoM+6FD91oBJgGNZC5sTd+yWaQ/3V 2RAO8Q1aWyU3kFB2yeusqhdDJfMXoYTWDqGqlroBqFDKh7vHv1QM2B63i379FdWkVZWI vG55MPv6J7pI15IUUDZn9TOlRC3Tbgu3kuM5aF7h2VcAn70o8iJvPA3XaJtPIsTIfLwa MIsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ramacher.at header.s=mail header.b=BJt6EWyu; 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 dz10-20020a0564021d4a00b0054561af0b2esi1821439edb.192.2023.11.12.07.12.01; Sun, 12 Nov 2023 07:12:12 -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; dkim=neutral (body hash did not verify) header.i=@ramacher.at header.s=mail header.b=BJt6EWyu; 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 A1C4468CC00; Sun, 12 Nov 2023 17:11:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from alphacentauri.ramacher.at (alphacentauri.ramacher.at [195.201.139.148]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 269B868CA1F for ; Sun, 12 Nov 2023 17:11:52 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ramacher.at ; s=mail; h=MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To :From:Content-Type; bh=inTs09jOwng9PjedJ2o03mUTgdGpvd5Lyfh9Js4tILQ=; b=BJt6EW yuS2ihBPjfgK7EwGT2/5POB7Dn8RFuFkcjCUuRzFje/I+NlTgqWDa8ApJpOjNceVORftBJuuF+5ha QGiH3cxLHlHoAe9mPXAcmS7ourVb5sL44KV+onicgIYE3q8V3ka48Bu1zfDWr70ZnQtXIxmiy732k JFGi44kJ+Ok=; From: Sebastian Ramacher To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Nov 2023 16:11:42 +0100 Message-ID: <20231112151144.2307049-2-sramacher@debian.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231112151144.2307049-1-sramacher@debian.org> References: <20231112151144.2307049-1-sramacher@debian.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/fft: Do not uninit never initialized ctx2 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 Cc: Sebastian Ramacher Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QIReajmxtgUj --- libavcodec/avfft.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/avfft.c b/libavcodec/avfft.c index fb635abfff..93203228c2 100644 --- a/libavcodec/avfft.c +++ b/libavcodec/avfft.c @@ -76,7 +76,6 @@ av_cold void av_fft_end(FFTContext *s) if (s) { AVTXWrapper *w = (AVTXWrapper *)s; av_tx_uninit(&w->ctx); - av_tx_uninit(&w->ctx2); av_free(w); } } From patchwork Sun Nov 12 15:11:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ramacher X-Patchwork-Id: 44636 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a5:b0:181:818d:5e7f with SMTP id q37csp836531pzg; Sun, 12 Nov 2023 07:12:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IFbo+V/G+kPDZ6o27+fU80N53K1Zbet99isA0V/yIEOMnimf3Yk6rz4OuryH0CPVLa+AUmd X-Received: by 2002:a2e:3a09:0:b0:2c5:15a5:826a with SMTP id h9-20020a2e3a09000000b002c515a5826amr2888747lja.19.1699801949337; Sun, 12 Nov 2023 07:12:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699801949; cv=none; d=google.com; s=arc-20160816; b=zcRDLtm8Yr5w7XMZOyujvqKvFnkluAEoE6FtH01lKEFsUL2Lr6Fkd1F1CsaSyHb7yq WUeDBOk6eVWjMPZLbySY5dEMO5v7sWtV4XNffgryklJy5hoySWwK2MGkvIeXbX7D1N3p U6hhvKQCQYOk9pnfMryBRajCF7n2Zo1NtrG5vQs0LVXe4O6BUhfOShV6OctOQcMGNGtP 8qX6nl1dWcoUe6UyBOprlKtEFTqQXWzDJ2reZ06diJBS9YojfgoP8OCh9zfGnECl7YJC wYrcHK/9E8gmhMTXP86T5mxoNOO1Pdkp8BuJICu6NNG0yuMaX5Ze/NKZ/uFHc5W8OqWl 70qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=cCfyRdgHhMrwmRD6VgOAixV24/FSqLa7lNVj0GU3SZY=; fh=w39lni1P4BnnoxhBEex6CszENd6FI9kbu5bpw99hC34=; b=oudxckJuWiOF4cVwSIhB/v06DqxB1cnCa1h4xT4Uhw4SSzln2WMh/UR97oy0L+fGVP R3u4IW6XwfZze9ZKJd8wXu8ryrbDrO75ouSl+Wma64G7XhD2sFbw0u4sxnBGmKiYpyVS uutXgBLw/adPZOUrBA5fLnbI4ZIWIPM/gBAoCrUhvMOK+xPbpszvXHKatNEmyjeKFOzA IyT2FKAe1E6BdXGnuFxeKiWmWV2UufD4BOJUZ/iwNtRHDxoxFCBt1c9aibUHX9JcXAwT Awm+vwra/sFu3ElqfuQrEW4JguvODNDRbavOipSs/UiuZNxs1ywN+dVU4UR/rlzVON/c 63mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ramacher.at header.s=mail header.b="henmA/BD"; 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 f27-20020a170906049b00b0098d7390816asi1815440eja.756.2023.11.12.07.12.29; Sun, 12 Nov 2023 07:12:29 -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; dkim=neutral (body hash did not verify) header.i=@ramacher.at header.s=mail header.b="henmA/BD"; 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 0F6C368CB76; Sun, 12 Nov 2023 17:12:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from alphacentauri.ramacher.at (alphacentauri.ramacher.at [195.201.139.148]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78FFE68CC67 for ; Sun, 12 Nov 2023 17:12:07 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ramacher.at ; s=mail; h=MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To :From:Content-Type; bh=5Ry3qYdqyzxrDytw0QKcY2+4rxOq1Q5yil4schzkNzw=; b=henmA/ BDaFvs3wPF29aBCz0CTxPlr4P6k2iO8Oq2TXaC1cSY0FNgvWdeGqVSFVPvT0e6Td9orUarRGbTaJ7 zoQQ7rzAkXVWmGyMK7KfBxxni5f3IcTM3dKee1rdHFy0E4+vAOkMbLcBx5FMH8h+LKSSL40UvdH+1 VJ5xWh7waSo=; From: Sebastian Ramacher To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Nov 2023 16:11:43 +0100 Message-ID: <20231112151144.2307049-3-sramacher@debian.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231112151144.2307049-1-sramacher@debian.org> References: <20231112151144.2307049-1-sramacher@debian.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/fft: Set potentially unused wrapper variables to avoid invalid free/uninit 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 Cc: Sebastian Ramacher Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9UqZjp0AKMi1 --- libavcodec/avfft.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/avfft.c b/libavcodec/avfft.c index 93203228c2..813b6d61a1 100644 --- a/libavcodec/avfft.c +++ b/libavcodec/avfft.c @@ -102,7 +102,8 @@ FFTContext *av_mdct_init(int nbits, int inverse, double scale) av_free(s); return NULL; } - } + } else + s->ctx2 = NULL; return (FFTContext *)s; } @@ -220,7 +221,8 @@ DCTContext *av_dct_init(int nbits, enum DCTTransformType inverse) av_free(s); return NULL; } - } + } else + s->tmp = NULL; return (DCTContext *)s; } From patchwork Sun Nov 12 15:11:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ramacher X-Patchwork-Id: 44638 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a5:b0:181:818d:5e7f with SMTP id q37csp836468pzg; Sun, 12 Nov 2023 07:12:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IGPcREhlUF17BAqgQoxj0OH6LoxGcs/MZtNEA8G5oXIlC2uiumRE5DYd2nszPcDr0RtH8Bd X-Received: by 2002:a05:6402:35d5:b0:542:a609:167f with SMTP id z21-20020a05640235d500b00542a609167fmr4075318edc.1.1699801942042; Sun, 12 Nov 2023 07:12:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699801942; cv=none; d=google.com; s=arc-20160816; b=n9PRLNCkpO505IyEiSYIPXeoFd7pQ04FgfZvz36hUk6898oZ5x2LPyWZ8/17ZXlz22 KRhWOYit38LFyKnVyZVU0T9utrvuWmtMDm1sba7MnvNy5lGls5ClcCCuuQ6+fQZhJN4M Yx5JHiLj4vCO/43wEzCnUjVVZ/AzYj4sfK3vfh48Wq2BqQYdseL5ea3hDyTBA5j5Dhp0 hDESNveuDYZ/+WIQidLtE+bLzcYcKteqVH7Ew4aXBZBemMQVjs7x6ru4qVsuisTDIRRv arHO+OucdjBOYV5bflGpE0AHILv+BysDKAtR9OkaLEflZWc9aY6Zr/yG7yspOjJjUBjv lAZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=1ZLbq/Nklg+thebCyLsuJx47s7f/HYyM/pnaVUrvvxg=; fh=w39lni1P4BnnoxhBEex6CszENd6FI9kbu5bpw99hC34=; b=ws34wkiDu6vQAYBU1TfRuwmF7RVwDboM5/j/lKSHaenJ82O0pQh2p68Aeghb6vTmEW RPEMacu4tbQRaRg51qvdHdLgzw7uvS9sgTaHImbK1nFfrQ+aMO02WXeI7ZQM4z+t5I2R +rmtBpTStmyBHochLYbda7thneLpUoapNBQ6mYQz4Dj8A2Sg4CLaGActR8VAKoOhKxMD ijs3R4/E7zj2Eyibg78i9cAHWHmw3o7AbNdCIpAU9p7V5r3dThLvuHasg0Ur7zT9blf0 OEeB5/c6nx5BIb+/nJTgHqL9Qospv4gvHvujaZxphlscT9HeJG1L96ZmZzt1x8p9aPG4 oqEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ramacher.at header.s=mail header.b=Tjuqq1fE; 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 cw11-20020a056402228b00b0053ef3aca6a0si1686841edb.535.2023.11.12.07.12.11; Sun, 12 Nov 2023 07:12:22 -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; dkim=neutral (body hash did not verify) header.i=@ramacher.at header.s=mail header.b=Tjuqq1fE; 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 D2DB968CC45; Sun, 12 Nov 2023 17:12:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from alphacentauri.ramacher.at (alphacentauri.ramacher.at [195.201.139.148]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D77E68CBBE for ; Sun, 12 Nov 2023 17:11:57 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ramacher.at ; s=mail; h=MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To :From:Content-Type; bh=XG+TihigKYpQZTERP1yapAoQlOjXTz/qMwSOtVsjrBE=; b=Tjuqq1 fE553sE65Vw9bfMTqsq9AlSHtmBpJajU1bN3wWy92jitGgJZt6KRUgSNkerLBug2gryhHVg8ZKX/A 8NWy2647BQT8RUcq130W0JdD2ItxOthfvaI4m6GfHNxbP7P0jsQaqVLHsImmoe0sHmIVWiI1SX2yA Q6cRtB/xXyw=; From: Sebastian Ramacher To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Nov 2023 16:11:44 +0100 Message-ID: <20231112151144.2307049-4-sramacher@debian.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231112151144.2307049-1-sramacher@debian.org> References: <20231112151144.2307049-1-sramacher@debian.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcoded/fft: Fix memory leak if ctx2 is used 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 Cc: Sebastian Ramacher Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zZRnhPDuNEw8 --- libavcodec/avfft.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/avfft.c b/libavcodec/avfft.c index 813b6d61a1..1b8d6f76c3 100644 --- a/libavcodec/avfft.c +++ b/libavcodec/avfft.c @@ -130,6 +130,7 @@ av_cold void av_mdct_end(FFTContext *s) { if (s) { AVTXWrapper *w = (AVTXWrapper *)s; + av_tx_uninit(&w->ctx2); av_tx_uninit(&w->ctx); av_free(w); }