From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 0B0CA4E4C9 for ; Fri, 23 Jan 2026 16:54:05 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'MAUxKFkxB8QkCmBhpM4f4QGkZ5TWgb6xKR/PYxmThX8=', expected b'2K+Nji9MiQLmM7ctFdwP2qIZNSqHkY6kJttFTQ6TsD8=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1769187236; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=MAUxKFkxB8QkCmBhpM4f4QGkZ5TWgb6xKR/PYxmThX8=; b=BVmjXKxiLpP8jyVfg1ZdY8Ok/W4fzSIPPLA/YU7FtHt4PYVkmD/laDDUQAr+/PTJlBDJV O1uuoO7vzWD4bhgeGCdaiHKqnNRbcBRPFFvY1htqQkT6aKeHw0v5g8PjoOUcA0radnd7PX9 TjHlZdMgJ4+N2AnBs3GwwvcH2cS+liMgyjMx8RpSZhQskcm0xKRQ3c0dOV1gIk+ahSAwoJJ RiOH6irrZic93g9oq3D8qnImyXXc5//22nf4IPcRlSiviwntUqg9ZVm+wa4WjSQMqg9VkHJ wTuRP/wxtHhV/hWoTZCcqVJZmoZt4z6H7z7tEhpELvNGsty8v0jnrY0MDYHQ== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 676F3691664; Fri, 23 Jan 2026 18:53:56 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1769187219; b=lBhZZ2uHL8HQ9qQLoMPzGgm4fq7fzIEcktPOPpsuE9pOQB18TOLhaEK54VarWNTdTjtrq 9La4/jUCh7Ayj1LqSCKFivSSCD7P5clnWfRqsDRlmBOK39Ngyuf/Kk+o/cLoSQDHD/9Ia+A AUeEiauMiVPYvYVU5G9/afxs7C4zBEYtsA9tEh8iJySCcmqu9bqkRUVKW313MWBVsXY+4EN j+oMqG3N6HVILDhYW6gWQ2rmDDEX+yoNRHj+WpeIpAgOfZYaqnr6m7Mh5ntHnjHtGdmDAMW /aG2hYp19G0JeFwn+pqEXDCc38GXHYBNtCrj8EQSMjhcaBRbYknY7A8N7ZYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1769187219; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=UVVy7wySqZkXTCaxiZ7Shfl85JQ/6ElK/4AA36QtLqY=; b=Adj6i/H6rXUj+3bh7/IGnByc9qFx64yDuIxgPsgIiaLIwcW2oYxAVCJuJC8EvF4jK0+Py WRb5jOWxXDU8aJ8o0hNMCRp9UiovmGAM88tvlVDuGHwYhS4nVs+JhER5hm6CfleYkOKU/Vw ysw6Xejf6FoMbi1QuJ7kPYXKsN5biR0IuDiPSUxm2wlRNx/Ka7+vi7pEbsjkPYXqtOXQCCW 0zoQy1P9c9UObsLvnmJ5G8shu9krMoOXPEqxH2kFqpbeC3idJPSLGkAaYi5y1UohBnka28f HIq3W07GtiQkdTgXefvnLBq6NLBT25eH/8AKAJGP2RN+b05RJ0F/1cbOXCNA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1769187211; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=2K+Nji9MiQLmM7ctFdwP2qIZNSqHkY6kJttFTQ6TsD8=; b=soaTGz4mWBYqmvzD70ECdRger8wVxA3wvzPAAJ+pmpX1+gBv7M60Ur+RMO5/NFdj51O3W FkSCE5qa/d+kaPs3u5CzasMo3IuP3TrxzFwZv2jJEGk/y9Jg+khBmoX80NvyvCyaTr/1TNf /E+AbDeZAQyKO5NNBg/7zuzYxUCuHMIFOKGcshhZY7vyyBxAIm4FCGvxwgAFsXg3FJcFtXl 3j77hxtTm6P0hVaNFBzU13LuTBegAWilihT7ukfQif4llXWEqt0Kro2hf+wuvei2Eoivmus 9UokW55gMrW1dBOnSpWEm6mt8oXotkf/zE20p0dAyw9uszO57/FcIQr1qaBQ== Received: from 69dab402ede7 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 6F2B369159F for ; Fri, 23 Jan 2026 18:53:31 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Jan 2026 16:53:31 -0000 Message-ID: <176918721160.25.16884120280050987944@4457048688e7> Message-ID-Hash: R2UBAG3DXHZ5ZQISR4JKXEMDYI33FHE2 X-Message-ID-Hash: R2UBAG3DXHZ5ZQISR4JKXEMDYI33FHE2 X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PR] avformat/mpegtsenc: Check remaining space in SDT (PR #21561) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: michaelni via ffmpeg-devel Cc: michaelni Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21561 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21561 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21561.patch Fixes: out of array access Fixes: VULN-8 Found-by: Zhenpeng (Leo) Lin from depthfirst Signed-off-by: Michael Niedermayer >>From e378f617e5fa0d6c321e297c0eaab3ee123baeb8 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 23 Jan 2026 15:28:58 +0100 Subject: [PATCH] avformat/mpegtsenc: Check remaining space in SDT Fixes: out of array access Fixes: VULN-8 Found-by: Zhenpeng (Leo) Lin from depthfirst Signed-off-by: Michael Niedermayer --- libavformat/mpegtsenc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index ea7c6065a0..96cdea955e 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -57,6 +57,7 @@ typedef struct MpegTSSection { int discontinuity; void (*write_packet)(struct MpegTSSection *s, const uint8_t *packet); void *opaque; + int remaining; } MpegTSSection; typedef struct MpegTSService { @@ -1018,6 +1019,10 @@ static MpegTSService *mpegts_add_service(AVFormatContext *s, int sid, av_log(s, AV_LOG_ERROR, "Too long service or provider name\n"); goto fail; } + ts->sdt.remaining -= 10 + service->provider_name[0] + service->name[0]; + if (ts->sdt.remaining < 0) + goto fail; + if (av_dynarray_add_nofree(&ts->services, &ts->nb_services, service) < 0) goto fail; @@ -1128,6 +1133,8 @@ static int mpegts_init(AVFormatContext *s) // round up to a whole number of TS packets ts->pes_payload_size = (ts->pes_payload_size + 14 + 183) / 184 * 184 - 14; + ts->sdt.remaining = SECTION_LENGTH - 3; + if (!s->nb_programs) { /* allocate a single DVB service */ if (!mpegts_add_service(s, ts->service_id, s->metadata, NULL)) -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org