[FFmpeg-devel] [PATCH] avutil/channel_layout: don't error out on truncated strings

James Almer jamrial at gmail.com
Sun Jul 3 01:25:32 EEST 2022


The doxy for av_channel_layout_describe() states that the user should look
at the return value to check if the string was truncated. Returning an error
code in this scenario goes against this and is an API break.

This is a better fix than the one committed in 8154cb7c2f for the timeout
fuzzing issue.

Signed-off-by: James Almer <jamrial at gmail.com>
---
 libavutil/channel_layout.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c
index 1887987789..d54a0adbe1 100644
--- a/libavutil/channel_layout.c
+++ b/libavutil/channel_layout.c
@@ -759,7 +759,7 @@ int av_channel_layout_describe_bprint(const AVChannelLayout *channel_layout,
                 av_bprintf(bp, "@%s", channel_layout->u.map[i].name);
 
             if (!av_bprint_is_complete(bp))
-                return AVERROR(ENOMEM);
+                break;
 
         }
         if (channel_layout->nb_channels) {
-- 
2.36.1



More information about the ffmpeg-devel mailing list