Re: [FFmpeg-devel] [PATCH 1/7] avcodec/assenc: Use size_t for length of string

[Andreas Rheinhardt]

Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt 
> ---
>  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;
>  }

Will apply this patchset tomorrow unless there are objections.

- Andreas

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 1/7] avcodec/assenc: Use size_t for length of string

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt 
---
 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;
 }
-- 
2.34.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".