[FFmpeg-cvslog] avcodec/assenc: Use size_t for length of string

Andreas Rheinhardt git at videolan.org
Thu Feb 22 02:54:08 EET 2024


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Feb 17 23:24:17 2024 +0100| [b8a00a1f73331af031cbb8d718d6439522896a3f] | committer: Andreas Rheinhardt

avcodec/assenc: Use size_t for length of string

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libavcodec/assenc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c
index e548b9fd3b..e734522729 100644
--- a/libavcodec/assenc.c
+++ b/libavcodec/assenc.c
@@ -45,7 +45,7 @@ static int ass_encode_frame(AVCodecContext *avctx,
                             unsigned char *buf, int bufsize,
                             const AVSubtitle *sub)
 {
-    int len;
+    size_t len;
 
     if (sub->num_rects != 1) {
         av_log(avctx, AV_LOG_ERROR, "Only one rect per AVSubtitle is supported in ASS.\n");
@@ -59,7 +59,7 @@ static int ass_encode_frame(AVCodecContext *avctx,
 
     len = av_strlcpy(buf, sub->rects[0]->ass, bufsize);
 
-    if (len > bufsize - 1) {
+    if (len >= bufsize) {
         av_log(avctx, AV_LOG_ERROR, "Buffer too small for ASS event.\n");
         return AVERROR_BUFFER_TOO_SMALL;
     }



More information about the ffmpeg-cvslog mailing list