[FFmpeg-cvslog] lavfi/subtitles: zero-init AVSubtitle.

Clément Bœsch git at videolan.org
Thu May 9 17:08:08 CEST 2013


ffmpeg | branch: release/1.2 | Clément Bœsch <ubitux at gmail.com> | Thu Apr 25 00:56:36 2013 +0200| [3d6219b6dbf4f2686bc6a56377f2610a49ec1e31] | committer: Clément Bœsch

lavfi/subtitles: zero-init AVSubtitle.

This avoids invalid free when the stream id doesn't match the packet
stream index.

Ticket #2501
(cherry picked from commit 035a3792c223d3b2bba79f38049bd6363b2d470d)

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

 libavfilter/vf_subtitles.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c
index 7513e24..7ba883a 100644
--- a/libavfilter/vf_subtitles.c
+++ b/libavfilter/vf_subtitles.c
@@ -332,7 +332,7 @@ static av_cold int init_subtitles(AVFilterContext *ctx, const char *args)
     pkt.size = 0;
     while (av_read_frame(fmt, &pkt) >= 0) {
         int i, got_subtitle;
-        AVSubtitle sub;
+        AVSubtitle sub = {0};
 
         if (pkt.stream_index == sid) {
             ret = avcodec_decode_subtitle2(dec_ctx, &sub, &got_subtitle, &pkt);



More information about the ffmpeg-cvslog mailing list