[FFmpeg-devel] [PATCH] avutil/opt: use AVBPrint to print a channel layout in av_opt_get()

[FFmpeg-devel] [PATCH] avutil/opt: use AVBPrint to print a channel layout in av_opt_get()

[James Almer]

A 128 byte buffer may not be enough for some layouts with lots of channels.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavutil/opt.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 0908751752..814b485a15 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -936,9 +936,15 @@ FF_DISABLE_DEPRECATION_WARNINGS
         break;
 FF_ENABLE_DEPRECATION_WARNINGS
 #endif
-    case AV_OPT_TYPE_CHLAYOUT:
-        ret = av_channel_layout_describe(dst, buf, sizeof(buf));
-        break;
+    case AV_OPT_TYPE_CHLAYOUT: {
+        AVBPrint bp;
+        av_bprint_init(&bp, 0, AV_BPRINT_SIZE_UNLIMITED);
+        av_channel_layout_describe_bprint(dst, &bp);
+        if (!av_bprint_is_complete(&bp))
+            return AVERROR(ENOMEM);
+        av_bprint_finalize(&bp, (char **)out_val);
+        return *out_val ? 0 : AVERROR(ENOMEM);
+    }
     case AV_OPT_TYPE_DICT:
         if (!*(AVDictionary **)dst && (search_flags & AV_OPT_ALLOW_NULL)) {
             *out_val = NULL;
-- 
2.43.0

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

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

Re: [FFmpeg-devel] [PATCH] avutil/opt: use AVBPrint to print a channel layout in av_opt_get()

[Andreas Rheinhardt]

James Almer:
> A 128 byte buffer may not be enough for some layouts with lots of channels.
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavutil/opt.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/libavutil/opt.c b/libavutil/opt.c
> index 0908751752..814b485a15 100644
> --- a/libavutil/opt.c
> +++ b/libavutil/opt.c
> @@ -936,9 +936,15 @@ FF_DISABLE_DEPRECATION_WARNINGS
>          break;
>  FF_ENABLE_DEPRECATION_WARNINGS
>  #endif
> -    case AV_OPT_TYPE_CHLAYOUT:
> -        ret = av_channel_layout_describe(dst, buf, sizeof(buf));
> -        break;
> +    case AV_OPT_TYPE_CHLAYOUT: {
> +        AVBPrint bp;
> +        av_bprint_init(&bp, 0, AV_BPRINT_SIZE_UNLIMITED);
> +        av_channel_layout_describe_bprint(dst, &bp);
> +        if (!av_bprint_is_complete(&bp))
> +            return AVERROR(ENOMEM);

Potential memleak here.

> +        av_bprint_finalize(&bp, (char **)out_val);
> +        return *out_val ? 0 : AVERROR(ENOMEM);
> +    }
>      case AV_OPT_TYPE_DICT:
>          if (!*(AVDictionary **)dst && (search_flags & AV_OPT_ALLOW_NULL)) {
>              *out_val = NULL;

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

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