[FFmpeg-devel] [PATCH] avcodec/libaomenc: fix MSan warning (PR #20974)

[FFmpeg-devel] [PATCH] avcodec/libaomenc: fix MSan warning (PR #20974)

[jzern via ffmpeg-devel]

PR #20974 opened by jzern
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20974
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20974.patch

codecctl_intp() is used to populate values via aom_codec_control(), not
set them. This change moves the output of the return pointer's value
after the aom_codec_control() to avoid a memory sanitizer warning (use
of uninitialized value).

Signed-off-by: James Zern <jzern@google.com>


>From 4bc22c6f578f2da93ed47cf4cf01f1c1e41b0a25 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Wed, 19 Nov 2025 10:38:58 -0800
Subject: [PATCH] avcodec/libaomenc: fix MSan warning

codecctl_intp() is used to populate values via aom_codec_control(), not
set them. This change moves the output of the return pointer's value
after the aom_codec_control() to avoid a memory sanitizer warning (use
of uninitialized value).

Signed-off-by: James Zern <jzern@google.com>
---
 libavcodec/libaomenc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
index 9fb97e74ff..1e5db4ad8c 100644
--- a/libavcodec/libaomenc.c
+++ b/libavcodec/libaomenc.c
@@ -392,17 +392,17 @@ static av_cold int codecctl_intp(AVCodecContext *avctx,
     int width = -30;
     int res;
 
-    snprintf(buf, sizeof(buf), "%s:", ctlidstr[id]);
-    av_log(avctx, AV_LOG_DEBUG, "  %*s%d\n", width, buf, *ptr);
-
     res = aom_codec_control(&ctx->encoder, id, ptr);
     if (res != AOM_CODEC_OK) {
-        snprintf(buf, sizeof(buf), "Failed to set %s codec control",
+        snprintf(buf, sizeof(buf), "Failed to get %s codec control",
                  ctlidstr[id]);
         log_encoder_error(avctx, buf);
         return AVERROR(EINVAL);
     }
 
+    snprintf(buf, sizeof(buf), "%s:", ctlidstr[id]);
+    av_log(avctx, AV_LOG_DEBUG, "  %*s%d\n", width, buf, *ptr);
+
     return 0;
 }
 #endif
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org