[FFmpeg-cvslog] lavc/dvdsubenc: check the type of rectangles.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Sun Aug 19 19:10:48 2012 +0200| [de60880543761003c3674d5d29e0af348f5eb301] | committer: Nicolas George

lavc/dvdsubenc: check the type of rectangles.

Avoid a crash if a text rectangle is provided.
Fix the segfault reported in trac ticket #1661.

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

 libavcodec/dvdsubenc.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c
index c87f336..d913708 100644
--- a/libavcodec/dvdsubenc.c
+++ b/libavcodec/dvdsubenc.c
@@ -256,6 +256,11 @@ static int encode_dvd_subtitles(AVCodecContext *avctx,
 
     if (rects == 0 || h->rects == NULL)
         return AVERROR(EINVAL);
+    for (i = 0; i < rects; i++)
+        if (h->rects[i]->type != SUBTITLE_BITMAP) {
+            av_log(avctx, AV_LOG_ERROR, "Bitmap subtitle required\n");
+            return AVERROR(EINVAL);
+        }
     vrect = *h->rects[0];
 
     if (rects > 1) {