avcodec/srtdec: Check ff_htmlmarkup_to_ass() return code

Michael Niedermayer committed 9 years ago

Commit 7b94df21 parent 983e3fb1 file · +5 −4Browse files

Unified · Split

 #include "ass.h"
 #include "htmlsubtitles.h"
-static void srt_to_ass(AVCodecContext *avctx, AVBPrint *dst,
+static int srt_to_ass(AVCodecContext *avctx, AVBPrint *dst,
                        const char *in, int x1, int y1, int x2, int y2)
 {
     if (x1 >= 0 && y1 >= 0) {
         }
     }
-    ff_htmlmarkup_to_ass(avctx, dst, in);
+    return ff_htmlmarkup_to_ass(avctx, dst, in);
 }
 static int srt_decode_frame(AVCodecContext *avctx,
     av_bprint_init(&buffer, 0, AV_BPRINT_SIZE_UNLIMITED);
-    srt_to_ass(avctx, &buffer, avpkt->data, x1, y1, x2, y2);
+    ret = srt_to_ass(avctx, &buffer, avpkt->data, x1, y1, x2, y2);
-    ret = ff_ass_add_rect(sub, buffer.str, s->readorder++, 0, NULL, NULL);
+    if (ret >= 0)
+        ret = ff_ass_add_rect(sub, buffer.str, s->readorder++, 0, NULL, NULL);
     av_bprint_finalize(&buffer, NULL);
     if (ret < 0)
         return ret;

Keyboard shortcuts