From patchwork Fri Jul 5 00:21:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50344 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp4000082vqv; Thu, 4 Jul 2024 17:22:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW+oIHbGSyYlVfqJhOwKigRByBRmsUiWuKACIHdzH3FMi5RLZJ5gnNbGBXlskoZ41P7S5EdcH33U7nJqhYHVBWYVSI9cC7j0okXYA== X-Google-Smtp-Source: AGHT+IEgA/P36rGEShwzQxlJGQSJSJU31QFJnrjN7y80eD0QVj5x+0rVOIh9geIk6XagBPpRh3Zg X-Received: by 2002:ac2:5f47:0:b0:52c:df55:e11a with SMTP id 2adb3069b0e04-52ea0619e69mr2159279e87.9.1720138930095; Thu, 04 Jul 2024 17:22:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720138930; cv=none; d=google.com; s=arc-20160816; b=dSsuw8xYLTJhV7sAWXbkJtI7PiWzTmaMBsshuXhBdqVdHr/tjvrAJy8CiwEZrJOfHh MMxXF4PY7Zl8Fw8NTAD39j2pmIHG3EZrbqsRQzY2Wryoqlrq4jfMrCvYGQK/eaKMdyyD WhKHrPnU0fJhLq4Rm7d8/Agn7VmocTBZogH8MP6FlqVqMzsYNxDmhA8ymX4RQz5SvsqI WOca/Vhlps54I6bzLwD+KA83pAeJ0MGz3KJ5OeG9PN4HLjE82RFz1z3RLr3nWCx5mh8f N8BmF4DsHiVtcMfkiojOEWj3n4Hwn+kMBe8LaX7NJnF8Wm3vt69GpAqE7hIk2Lb4d6Af ewCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=kCYRrVIvu42/9/cU6s3G3i7te+b5bEOeYNkjMj70g+Y=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=WeCRTXtwiI5Iv3YJhGL2Q1AWfpWjtI3LeEJ3AWtj96X5jxO2qHgTVzoQAoatshZe2e /yJcGcpwxohCziI7gC4/5B5E9xf9DUTVWYEJ2zNVNb+S8ZlGm+YRlHfA4WGg0Vief52G yiBnvVl2Am++0Hi/e/MN4LAWWKztiBiqqQDqqlExFt08MLuLREB9irnjmixyZwfknwaZ IBsfl6rwTSdWxiJqpA2iEblHR6kp0OgWfGCM0cyeyMUZDo59/ny8MHSlXK0gnhAmNzud h8o1lp08JtQasoCo8D9XTi2VJZZxC6buCa1chq9ICdqflX8Htd7tC4ap3cCexoJ7XfjY GaLA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=NLj4PSus; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-52ea28cf46fsi469246e87.615.2024.07.04.17.22.09; Thu, 04 Jul 2024 17:22:10 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=NLj4PSus; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 99DF868D9FF; Fri, 5 Jul 2024 03:22:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 10EBD68D91A for ; Fri, 5 Jul 2024 03:21:58 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id C38FBFF803 for ; Fri, 5 Jul 2024 00:21:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720138916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=bdk6nQTiKuI/h26IdJjpk0v7p4mR+h3dFmAiuc/7tuQ=; b=NLj4PSusg0nb6wXObpuqoak932d7xHRFnp83CwUZMIlbDQIMLFz+lO0jpZLFayyPh7G05u qZJxQ7ixEew6sEYPZt5Yx0Tx82TYFwHfWSiXvsGrl5eUBgah3Ytv/ZqwHFEb2epqUXK+gH 9mJ51i4jL/m11TqbhI8l3ZhdEWhNkLpFN9kjQd0IqlVz+ZkbHVlF8+6sSJdb6W3XQXRRMO roIGqhodgMT+F+5mJpglrqk4gWNXR4Outfs/B7ju0TJeOD/d4BgSpzCgNNI4KCYaoq9lJV 2+1x9f5aiChNIHqVdBNABJnTJajz3uLMtjZc/Pre+q2nOgDGuok/XZBKn6leZg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 5 Jul 2024 02:21:42 +0200 Message-ID: <20240705002156.1964272-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 01/15] avcodec/xsubdec: Check parse_timecode() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 10/zYuefDLzG Fixes: CID1604490 Overflowed constant Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- 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