From patchwork Sun Mar 10 18:07:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 46941 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp832261pzb; Sun, 10 Mar 2024 11:07:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXOnPPNUuDb5dc7cnmhRPZTcyZbXRfBvineQ7YDFE/LnBQ8ieW/at9EuzYkvGCmp1Yh6qk+8PVQYX4Flu1b/zF7407SotPdWPfg+g== X-Google-Smtp-Source: AGHT+IESJ+xVDo587/OMsFvEvyzvAPGhe/QOrOi7ahhTVu13F9WIyMjIzZCpKKrAey87P9iD+BFn X-Received: by 2002:ac2:4475:0:b0:512:ab58:3807 with SMTP id y21-20020ac24475000000b00512ab583807mr2871735lfl.9.1710094050476; Sun, 10 Mar 2024 11:07:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710094050; cv=none; d=google.com; s=arc-20160816; b=X2b3wZpl3H8N1EEl9rZJfHdVew68rHHgyfGW40YPycJybTPWxKP5sXjm068xUMQF45 rZHJnRLidmENvwQZtdWy1YWAWnlqyIYmQi5JnXLIvxx8EsEqOjP2IcwypS+0i1wC+dAj kfJR0sYj5jTlF8tW6XUeRYxvSwr9wa/FOHfrHuUn05BO6jH8FBG5dOFkAsmHjrpyz2AI yfDSZPCMgH+RsWj8t1P1MHbguZgaXH/wd8imi786uc5/BbVGJ5kB44mx8lP8oKDKHran C7GehzFgqudsSLgZh9jjSvV73e2hCOyQItC6K1KSzrwcWiZlOQrp8900QOtM3s48zOST j5Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=kdKeaEy/m8AupbfC/3KtDqW9kIPECuCuqXXLOl06+7w=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=ALWBDlZQ8KiaREgxYgoO/zsElOo+QJg6RVcrTDEFxRUuLLny6yewgdchkpXuifQ9Cs 2qWLGd6uAnlJKJmOj6qkVwhs78KswOxA6I1pEudzBwQ4O8htElyZoreLbWr3+IfWgrBl A8d6kHNLUR4XCfwtu4ua9yF22zpaLDmqPNzrvuP3+/KYFRsO6RnDlCXs9ahioQSOtOze +UbuZr4eDP953H6QJ0GAlfxHXPnOkcviQU+3zrAboVp5jpXj92QILnAMC2wIYDWFx0sV JwcbogxN1I7XgXH2xY0gtJ2P6k6/3YJ9AtTKvVLeh5H53WRAR/DJAxgRNYOYQiJqXOXn W5xA==; 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=Jkgqdtgz; 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 g18-20020a17090613d200b00a44cb0bf0basi1741481ejc.205.2024.03.10.11.07.30; Sun, 10 Mar 2024 11:07:30 -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=Jkgqdtgz; 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 F2A4568CE33; Sun, 10 Mar 2024 20:07:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pHUqcTd+H9tW 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;