Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH 01/15] avcodec/xsubdec: Check parse_timecode()
@ 2024-07-05  0:21 Michael Niedermayer
  2024-07-05  0:21 ` [FFmpeg-devel] [PATCH 02/15] avcodec/cri: Check length Michael Niedermayer
                   ` (14 more replies)
  0 siblings, 15 replies; 16+ messages in thread
From: Michael Niedermayer @ 2024-07-05  0:21 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

Fixes: CID1604490 Overflowed constant

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/xsubdec.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c
index db7873593c8..6be4c18b0b5 100644
--- a/libavcodec/xsubdec.c
+++ b/libavcodec/xsubdec.c
@@ -60,6 +60,7 @@ static int decode_frame(AVCodecContext *avctx, AVSubtitle *sub,
     int64_t packet_time = 0;
     GetBitContext gb;
     int has_alpha = avctx->codec_tag == MKTAG('D','X','S','A');
+    int64_t start_display_time, end_display_time;
 
     // check that at least header fits
     if (buf_size < 27 + 7 * 2 + 4 * (3 + has_alpha)) {
@@ -74,8 +75,14 @@ static int decode_frame(AVCodecContext *avctx, AVSubtitle *sub,
     }
     if (avpkt->pts != AV_NOPTS_VALUE)
         packet_time = av_rescale_q(avpkt->pts, AV_TIME_BASE_Q, (AVRational){1, 1000});
-    sub->start_display_time = parse_timecode(buf +  1, packet_time);
-    sub->end_display_time   = parse_timecode(buf + 14, packet_time);
+
+    sub->start_display_time = start_display_time = parse_timecode(buf +  1, packet_time);
+    sub->end_display_time   = end_display_time   = parse_timecode(buf + 14, packet_time);
+    if (sub->start_display_time != start_display_time ||
+        sub->  end_display_time !=   end_display_time) {
+        av_log(avctx, AV_LOG_ERROR, "time code not representable in 32bit\n");
+        return -1;
+    }
     buf += 27;
 
     // read header
-- 
2.45.2

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2024-07-12 20:41 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-05  0:21 [FFmpeg-devel] [PATCH 01/15] avcodec/xsubdec: Check parse_timecode() Michael Niedermayer
2024-07-05  0:21 ` [FFmpeg-devel] [PATCH 02/15] avcodec/cri: Check length Michael Niedermayer
2024-07-05  0:21 ` [FFmpeg-devel] [PATCH 03/15] avcodec/dxv: Fix type in get_opcodes() Michael Niedermayer
2024-07-05  0:21 ` [FFmpeg-devel] [PATCH 04/15] avcodec/golomb: Document return for get_ur_golomb_jpegls() and get_sr_golomb_flac() Michael Niedermayer
2024-07-05  0:21 ` [FFmpeg-devel] [PATCH 05/15] avcodec/golomb: Assert that k is in the supported range for get_ur/sr_golomb() Michael Niedermayer
2024-07-05  0:21 ` [FFmpeg-devel] [PATCH 06/15] avcodec/hw_base_encode: Simplify EOF check Michael Niedermayer
2024-07-05  0:21 ` [FFmpeg-devel] [PATCH 07/15] avcodec/iff: Use signed count Michael Niedermayer
2024-07-05  0:21 ` [FFmpeg-devel] [PATCH 08/15] avcodec/imm4: check cbphi for error Michael Niedermayer
2024-07-05  0:21 ` [FFmpeg-devel] [PATCH 09/15] avcodec/leaddec: Check init_get_bits8() for failure Michael Niedermayer
2024-07-05  0:21 ` [FFmpeg-devel] [PATCH 10/15] avcodec/loco: check get_ur_golomb_jpegls() " Michael Niedermayer
2024-07-05  0:21 ` [FFmpeg-devel] [PATCH 11/15] avcodec/loco: Check loco_get_rice() " Michael Niedermayer
2024-07-05  0:21 ` [FFmpeg-devel] [PATCH 12/15] avcodec/me_cmp: Fix type check Michael Niedermayer
2024-07-05  0:21 ` [FFmpeg-devel] [PATCH 13/15] avcodec/mlpenc: Use 64 for ml, mr Michael Niedermayer
2024-07-05  0:21 ` [FFmpeg-devel] [PATCH 14/15] avcodec/motion_est: Fix score squaring overflow Michael Niedermayer
2024-07-05  0:21 ` [FFmpeg-devel] [PATCH 15/15] avcodec/pixlet: Simplify pfx computation Michael Niedermayer
2024-07-12 20:41 ` [FFmpeg-devel] [PATCH 01/15] avcodec/xsubdec: Check parse_timecode() Michael Niedermayer

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git