[FFmpeg-cvslog] fftools/ffmpeg: Zero subtitle packet padding

Andreas Rheinhardt git at videolan.org
Sat Jul 23 23:43:46 EEST 2022


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Jul 23 18:33:08 2022 +0200| [b0ae5d02f3664545e54c8ce0101037619c4fa7e6] | committer: Andreas Rheinhardt

fftools/ffmpeg: Zero subtitle packet padding

Fixes uninitialized reads in the sub-lrc-remux test.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 fftools/ffmpeg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 632ac25cb2..1089cc48c4 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -1118,7 +1118,7 @@ static void do_subtitle_out(OutputFile *of,
             exit_program(1);
         }
 
-        pkt->size = subtitle_out_size;
+        av_shrink_packet(pkt, subtitle_out_size);
         pkt->pts  = av_rescale_q(sub->pts, AV_TIME_BASE_Q, ost->mux_timebase);
         pkt->duration = av_rescale_q(sub->end_display_time, (AVRational){ 1, 1000 }, ost->mux_timebase);
         if (enc->codec_id == AV_CODEC_ID_DVB_SUBTITLE) {



More information about the ffmpeg-cvslog mailing list