From: Sebastian Ramacher <sramacher@debian.org>
To: ffmpeg-devel@ffmpeg.org
Cc: Sebastian Ramacher <sramacher@debian.org>
Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/fft: Set potentially unused wrapper variables to avoid invalid free/uninit
Date: Sun, 12 Nov 2023 16:11:43 +0100
Message-ID: <20231112151144.2307049-3-sramacher@debian.org> (raw)
In-Reply-To: <20231112151144.2307049-1-sramacher@debian.org>
---
 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;
 }
-- 
2.42.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply	other threads:[~2023-11-12 15:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-12 15:11 [FFmpeg-devel] [PATCH 0/3] Fix invalid frees, segfaults and memory leaks in avcodec/fft wrappers Sebastian Ramacher
2023-11-12 15:11 ` [FFmpeg-devel] [PATCH 1/3] avcodec/fft: Do not uninit never initialized ctx2 Sebastian Ramacher
2023-11-12 15:11 ` Sebastian Ramacher [this message]
2023-11-12 15:17   ` [FFmpeg-devel] [PATCH 2/3] avcodec/fft: Set potentially unused wrapper variables to avoid invalid free/uninit James Almer
2023-11-12 15:11 ` [FFmpeg-devel] [PATCH 3/3] avcoded/fft: Fix memory leak if ctx2 is used Sebastian Ramacher
2023-11-12 17:46 ` [FFmpeg-devel] [PATCHv2 1/2] avcodec/fft: Use av_mallocz to avoid invalid free/uninit Sebastian Ramacher
2023-11-12 17:46   ` [FFmpeg-devel] [PATCHv2 2/2] avcoded/fft: Fix memory leak if ctx2 is used Sebastian Ramacher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox
  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):
  git send-email \
    --in-reply-to=20231112151144.2307049-3-sramacher@debian.org \
    --to=sramacher@debian.org \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY
  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git