[FFmpeg-devel] [PATCH] libavfilter/af_channelmap: Add check for av_calloc() to avoid potential NULL pointer dereference

[FFmpeg-devel] [PATCH] libavfilter/af_channelmap: Add check for av_calloc() to avoid potential NULL pointer dereference

[Jiasheng Jiang]

Add check for the return value of av_calloc() to avoid potential NULL pointer dereference.

Fixes: 7dc81d33c2 ("lavfi/af_channelmap: remove an arbitrary limit on channel count")
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
---
 libavfilter/af_channelmap.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c
index b864317312..9466a8e22e 100644
--- a/libavfilter/af_channelmap.c
+++ b/libavfilter/af_channelmap.c
@@ -315,6 +315,9 @@ static av_cold int channelmap_init(AVFilterContext *ctx)
     }
 
     presence_map = av_calloc(s->nch, sizeof(*presence_map));
+    if (!presence_map)
+        return AVERROR(ENOMEM);
+
     for (i = 0; i < s->nch; i++) {
         const int out_idx = s->map[i].out_channel_idx;
         ret = check_idx_and_id(ctx, out_idx, s->map[i].out_channel, &s->output_layout, "out");
-- 
2.25.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-request@ffmpeg.org with subject "unsubscribe".