[FFmpeg-devel] [PATCH] avcodec/movtextenc: fix compile warning for type-limits

Nuo Mi nuomi2021 at gmail.com
Sun Feb 14 08:27:39 EET 2021


CC      libavcodec/mpegaudiodec_common.o
libavcodec/movtextenc.c: In function ‘mov_text_style_start’:
libavcodec/movtextenc.c:358:26: warning: comparison is always false due to limited range of data type [-Wtype-limits]
  358 |         if (s->count + 1 > SIZE_MAX / sizeof(*s->style_attributes) ||
---
 libavcodec/movtextenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c
index 1bef21e0b9..cd0e43a79b 100644
--- a/libavcodec/movtextenc.c
+++ b/libavcodec/movtextenc.c
@@ -355,7 +355,7 @@ static int mov_text_style_start(MovTextContext *s)
         StyleBox *tmp;
 
         // last style != defaults, end the style entry and start a new one
-        if (s->count + 1 > SIZE_MAX / sizeof(*s->style_attributes) ||
+        if ((s->count + 1) *  sizeof(*s->style_attributes) > SIZE_MAX ||
             !(tmp = av_fast_realloc(s->style_attributes,
                                     &s->style_attributes_bytes_allocated,
                                     (s->count + 1) * sizeof(*s->style_attributes)))) {
-- 
2.25.1



More information about the ffmpeg-devel mailing list