From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 41BD1493ED for ; Sun, 10 Mar 2024 18:07:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B617C68CE23; Sun, 10 Mar 2024 20:07:27 +0200 (EET) Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE11B68C515 for ; Sun, 10 Mar 2024 20:07:20 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 57BF1E0005 for ; Sun, 10 Mar 2024 18:07:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1710094040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=FNxOAipIrb58OWUeiCf9yaiHpC5b+74uhe02Niahru4=; b=JkgqdtgzTEugMfDH00KJI3M4CMciH9FsDNOk4FymOUKW+TbnNIesXUxh10c2cONCSaIDPd 6cIgx+v1NBf4tsEoHfum+DPQOu0bzxfszZN4a8NcGedkBh2l9ij7yhLlMZzOmrcdLUu6kP OBijUi9b/YHQwcvZRssBUVsIFMFqWYzAEsxs18ZypL6doYSRHhnIIly0X6DM4IAN5iD1rq ZjSn0qkvSD1moLaXSsUgK1riLM4XK1RX2kH+BCRMB5YMeLTrsB/kEcUAIWPRXUDxk9xWgV MJfCcK34ref/n3jj6Aag/2AUhhOQslAUB1Keg0pWAxPkCXtJQOiDin9xGFOfPg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 10 Mar 2024 19:07:19 +0100 Message-Id: <20240310180719.8902-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH] avformat/mpegts: Reset local nb_prg on add_program() failure 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 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: add_program() will deallocate the whole array on failure so we must clear nb_prgs Fixes: null pointer dereference Fixes: crash-35a3b39ddcc5babeeb005b7399a3a1217c8781bc Found-by: Catena cyber Signed-off-by: Michael Niedermayer --- libavformat/mpegts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index de7a3c8b45..320926248b 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2605,7 +2605,8 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len FFSWAP(struct Program, ts->prg[nb_prg], ts->prg[prg_idx]); if (prg_idx >= nb_prg) nb_prg++; - } + } else + nb_prg = 0; } } ts->nb_prg = nb_prg; -- 2.17.1 _______________________________________________ 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".