ffmpeg | branch: release/4.2 | Michael Niedermayer <mich...@niedermayer.cc> | Sat Sep 30 19:59:06 2023 +0200| [61af3a5f2a4d3aeb36bebacf22f35e7a7fbd69b2] | committer: Michael Niedermayer
avformat/jacosubdec: Check timeres Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit 51f0ab8b127282415822959ccad7db95ad749b5d) Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61af3a5f2a4d3aeb36bebacf22f35e7a7fbd69b2 --- libavformat/jacosubdec.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavformat/jacosubdec.c b/libavformat/jacosubdec.c index 2684b6d9bb..549ba95a7a 100644 --- a/libavformat/jacosubdec.c +++ b/libavformat/jacosubdec.c @@ -229,14 +229,17 @@ static int jacosub_read_header(AVFormatContext *s) } av_bprintf(&header, "#S %s", p); break; - case 'T': // ...but must be placed after TIMERES - jacosub->timeres = strtol(p, NULL, 10); - if (!jacosub->timeres) + case 'T': { // ...but must be placed after TIMERES + int64_t timeres = strtol(p, NULL, 10); + if (timeres <= 0 || timeres > UINT32_MAX) { jacosub->timeres = 30; - else + } else { + jacosub->timeres = timeres; av_bprintf(&header, "#T %s", p); + } break; } + } } /* general/essential directives in the extradata */ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
