[FFmpeg-cvslog] avcodec/samidec: add some memory checks

Clément Bœsch git at videolan.org
Sun Sep 21 18:45:57 CEST 2014


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Sep 20 22:11:34 2014 +0200| [6a65da3a182cd237ba7251de89aaa5168e266497] | committer: Clément Bœsch

avcodec/samidec: add some memory checks

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

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

diff --git a/libavcodec/samidec.c b/libavcodec/samidec.c
index 39ac608..8616288 100644
--- a/libavcodec/samidec.c
+++ b/libavcodec/samidec.c
@@ -122,7 +122,9 @@ static int sami_decode_frame(AVCodecContext *avctx,
         int ts_start     = av_rescale_q(avpkt->pts, avctx->time_base, (AVRational){1,100});
         int ts_duration  = avpkt->duration != -1 ?
                            av_rescale_q(avpkt->duration, avctx->time_base, (AVRational){1,100}) : -1;
-        ff_ass_add_rect(sub, sami->full.str, ts_start, ts_duration, 0);
+        int ret = ff_ass_add_rect_bprint(sub, &sami->full, ts_start, ts_duration, 0);
+        if (ret < 0)
+            return ret;
     }
     *got_sub_ptr = sub->num_rects > 0;
     return avpkt->size;



More information about the ffmpeg-cvslog mailing list