sonic: mark as experimental

[ffmpeg] / libavcodec / assdec.c

diff --git a/libavcodec/assdec.c b/libavcodec/assdec.c
index 087a0c839b35e97af9f84bce1e23ecfda40d14d7..47ea3308f4fe3064d8884f64aefe7c360cb49315 100644 (file)
--- a/libavcodec/assdec.c
+++ b/libavcodec/assdec.c
@@ -26,7 +26,7 @@
 static av_cold int ass_decode_init(AVCodecContext *avctx)
 {
     avctx->subtitle_header = av_malloc(avctx->extradata_size);
-    if (!avctx->extradata)
+    if (!avctx->subtitle_header)
         return AVERROR(ENOMEM);
     memcpy(avctx->subtitle_header, avctx->extradata, avctx->extradata_size);
     avctx->subtitle_header_size = avctx->extradata_size;
@@ -41,8 +41,11 @@ static int ass_decode_frame(AVCodecContext *avctx, void *data, int *got_sub_ptr,
     int len, size = avpkt->size;
 
     while (size > 0) {
+        int duration;
         ASSDialog *dialog = ff_ass_split_dialog(avctx->priv_data, ptr, 0, NULL);
-        int duration = dialog->end - dialog->start;
+        if (!dialog)
+            return AVERROR_INVALIDDATA;
+        duration = dialog->end - dialog->start;
         len = ff_ass_add_rect(data, ptr, 0, duration, 1);
         if (len < 0)
             return len;