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

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

[Jiasheng Jiang]

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

Fixes: 1eeb59a209 ("avfilter/vf_drawtext: improve glyph shaping and positioning")
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
---
 libavfilter/vf_drawtext.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index 674e1e53c1..2eb144b5bf 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -1437,6 +1437,11 @@ continue_on_failed:
     s->line_count = line_count;
     s->lines = av_mallocz(line_count * sizeof(TextLine));
     s->tab_clusters = av_mallocz(s->tab_count * sizeof(uint32_t));
+    if (!s->lines || !s->tab_clusters) {
+        ret = AVERROR(ENOMEM);
+        goto done;
+    }
+
     for (i = 0; i < s->tab_count; ++i) {
         s->tab_clusters[i] = -1;
     }
-- 
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".

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

[Nicolas George]

Jiasheng Jiang (HE12025-08-07):
> Add check for the return value of av_mallocz() to avoid potential NULL pointer dereference.

LGTM, thanks.

Regards,

-- 
  Nicolas George
_______________________________________________
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".