[FFmpeg-cvslog] avcodec/noise_bsf: Check for wrapped frames

Michael Niedermayer git at videolan.org
Mon Jun 12 01:22:55 EEST 2023


ffmpeg | branch: release/3.4 | Michael Niedermayer <michael at niedermayer.cc> | Sun Jun  4 19:59:40 2023 +0200| [7b4662fae5e9e0e3fe70d93471b04ccdb7c0e2d7] | committer: Michael Niedermayer

avcodec/noise_bsf: Check for wrapped frames

Wrapped frames contain pointers so they need specific code to
noise them, the generic code would lead to segfaults

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 0889ebc577749ee6abc620bc9030d2002487935f)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b4662fae5e9e0e3fe70d93471b04ccdb7c0e2d7
---

 libavcodec/noise_bsf.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/noise_bsf.c b/libavcodec/noise_bsf.c
index 84b94032ad..42b632dd7a 100644
--- a/libavcodec/noise_bsf.c
+++ b/libavcodec/noise_bsf.c
@@ -45,6 +45,11 @@ static int noise(AVBSFContext *ctx, AVPacket *out)
     if (amount <= 0)
         return AVERROR(EINVAL);
 
+    if (ctx->par_in->codec_id == AV_CODEC_ID_WRAPPED_AVFRAME) {
+        av_log(ctx, AV_LOG_ERROR, "Wrapped AVFrame noising is unsupported\n");
+        return AVERROR_PATCHWELCOME;
+    }
+
     ret = ff_bsf_get_packet(ctx, &in);
     if (ret < 0)
         return ret;



More information about the ffmpeg-cvslog mailing list