[FFmpeg-cvslog] avcodec/samidec: check av_strdup() return value

Pan Bian git at videolan.org
Wed Nov 29 23:25:37 EET 2017


ffmpeg | branch: master | Pan Bian <bianpan2016 at 163.com> | Mon Nov 27 14:56:32 2017 +0800| [61bbc537ab2305392bd170a6f404ed6402bee4a8] | committer: Clément Bœsch

avcodec/samidec: check av_strdup() return value

In function sami_paragraph_to_ass(), the return value of av_strdup() is
not checked. To avoid potential NULL dereference, the return value
should be checked against NULL.

Signed-off-by: Pan Bian <bianpan2016 at 163.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61bbc537ab2305392bd170a6f404ed6402bee4a8
---

 libavcodec/samidec.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/samidec.c b/libavcodec/samidec.c
index 2620424750..6a598060ef 100644
--- a/libavcodec/samidec.c
+++ b/libavcodec/samidec.c
@@ -48,6 +48,9 @@ static int sami_paragraph_to_ass(AVCodecContext *avctx, const char *src)
     AVBPrint *dst_content = &sami->encoded_content;
     AVBPrint *dst_source = &sami->encoded_source;
 
+    if (!dupsrc)
+        return AVERROR(ENOMEM);
+
     av_bprint_clear(&sami->encoded_content);
     av_bprint_clear(&sami->content);
     av_bprint_clear(&sami->encoded_source);



More information about the ffmpeg-cvslog mailing list