From: Michael Niedermayer <michael@niedermayer.cc>
Date: Fri, 5 May 2017 23:50:58 +0000 (+0200)
Subject: avcodec/samidec: Check ff_htmlmarkup_to_ass() return code
X-Git-Tag: android-x86-7.1-r1~452
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=983e3fbcc5c976db8f3ba6231fca86355a33cb77;p=android-x86%2Fexternal-ffmpeg.git

avcodec/samidec: Check ff_htmlmarkup_to_ass() return code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavcodec/samidec.c b/libavcodec/samidec.c
index 16f3f58c1c..2620424750 100644
--- a/libavcodec/samidec.c
+++ b/libavcodec/samidec.c
@@ -113,10 +113,14 @@ static int sami_paragraph_to_ass(AVCodecContext *avctx, const char *src)
 
     av_bprint_clear(&sami->full);
     if (sami->source.len) {
-        ff_htmlmarkup_to_ass(avctx, dst_source, sami->source.str);
+        ret = ff_htmlmarkup_to_ass(avctx, dst_source, sami->source.str);
+        if (ret < 0)
+            goto end;
         av_bprintf(&sami->full, "{\\i1}%s{\\i0}\\N", sami->encoded_source.str);
     }
-    ff_htmlmarkup_to_ass(avctx, dst_content, sami->content.str);
+    ret = ff_htmlmarkup_to_ass(avctx, dst_content, sami->content.str);
+    if (ret < 0)
+        goto end;
     av_bprintf(&sami->full, "%s", sami->encoded_content.str);
 
 end: