PR #20859 opened by caifan URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20859 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20859.patch
ensure formatted timecode string fits in AV_TIMECODE_STR_SIZE, eliminates -Wformat-truncation compiler warning. Signed-off-by: caifan3 <[email protected]> >From 7301d28c814971a60da19c944ba610218ce419ed Mon Sep 17 00:00:00 2001 From: caifan3 <[email protected]> Date: Fri, 7 Nov 2025 18:27:40 +0800 Subject: [PATCH] libavutil/timecodec: fix potential snprintf truncation in av_timecode_make_string ensure formatted timecode string fits in AV_TIMECODE_STR_SIZE, eliminates -Wformat-truncation compiler warning. Signed-off-by: caifan3 <[email protected]> --- libavutil/timecode.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavutil/timecode.c b/libavutil/timecode.c index bca16b6ac2..2a2bf6ddf1 100644 --- a/libavutil/timecode.c +++ b/libavutil/timecode.c @@ -32,6 +32,7 @@ #include "timecode_internal.h" #include "log.h" #include "error.h" +#include "libavutil/avassert.h" int av_timecode_adjust_ntsc_framenum2(int framenum, int fps) { @@ -105,7 +106,7 @@ char *av_timecode_make_string(const AVTimecode *tc, char *buf, int framenum_arg) { int fps = tc->fps; int drop = tc->flags & AV_TIMECODE_FLAG_DROPFRAME; - int hh, mm, ss, ff, ff_len, neg = 0; + int hh, mm, ss, ff, ff_len, len, neg = 0; int64_t framenum = framenum_arg; framenum += tc->start; @@ -122,9 +123,10 @@ char *av_timecode_make_string(const AVTimecode *tc, char *buf, int framenum_arg) if (tc->flags & AV_TIMECODE_FLAG_24HOURSMAX) hh = hh % 24; ff_len = fps > 10000 ? 5 : fps > 1000 ? 4 : fps > 100 ? 3 : fps > 10 ? 2 : 1; - snprintf(buf, AV_TIMECODE_STR_SIZE, "%s%02d:%02d:%02d%c%0*d", - neg ? "-" : "", - hh, mm, ss, drop ? ';' : ':', ff_len, ff); + len = snprintf(buf, AV_TIMECODE_STR_SIZE, "%s%02d:%02d:%02d%c%0*d", + neg ? "-" : "", + hh, mm, ss, drop ? ';' : ':', ff_len, ff); + av_assert0(len >= 0 && len < sizeof(buf)); return buf; } -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
