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 B530945473 for ; Tue, 30 May 2023 21:22:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F25568BF6F; Wed, 31 May 2023 00:22:03 +0300 (EEST) Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [212.27.42.2]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A64168B48D for ; Wed, 31 May 2023 00:21:57 +0300 (EEST) Received: from Coucou-PC.webspeed.dk (unknown [188.178.217.132]) (Authenticated sender: paul.arzelier@free.fr) by smtp2-g21.free.fr (Postfix) with ESMTPSA id 774D12003D6; Tue, 30 May 2023 23:21:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1685481716; bh=PD6bKTHW5fbTLg4zMObRhwcpJrFFBJ9xRJyAoc3TYEs=; h=From:To:Cc:Subject:Date:From; b=klyhvAZ44bu4iNfMBByVr+HroN2RZHGgUkaPDLDcKkPQsnDvWV6vKVAnxTYoUEMDu YjTCGdAXXGCNrb/duc4Qm3wPzL0pWHnGJQV/rHxNnJdA2d5fF8YmC/qW5rt08mzOtU /IyhADx4VSKeQIHOISV1tPJ3DERH5Ow2WC44Se21E5bockFXtWJCqyq14NxBaJPn45 SEBYx0NIwOhLc9k9sFKkE9ER1ft+LBlpe9CxX5nh3tpv4Z+jYHOF7hLQRGZhrYX9UA l3T2iiJ+7tYDWdW4gpiwb5CvMDQUogyJUIo65WxRlikEQKO2+yzkXc927OWlL87nJ5 mMxlWUV+R9AbA== From: Paul Arzelier To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 May 2023 23:21:36 +0200 Message-Id: <20230530212136.1368389-1-paul.arzelier@free.fr> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/oggparseflac: check init_get_bits' result 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 Cc: Paul Arzelier , Polochon-street 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: From: Polochon-street Check init_get_bits' result for NULL, to avoid dereferencing a NULL pointer later (CWE-476). Without this, a segfault happens when trying to decode a handcrafted ogg-flac file with an absurdly long (e.g. 268435455 bytes) ogg header. Thanks to jamrial for basically writing this patch after I reported the bug! Signed-off-by: Paul Arzelier --- libavformat/oggparseflac.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c index eef6e09927..557440d94b 100644 --- a/libavformat/oggparseflac.c +++ b/libavformat/oggparseflac.c @@ -40,7 +40,10 @@ flac_header (AVFormatContext * s, int idx) if (os->buf[os->pstart] == 0xff) return 0; - init_get_bits(&gb, os->buf + os->pstart, os->psize*8); + ret = init_get_bits8(&gb, os->buf + os->pstart, os->psize); + if (ret < 0) + return ret; + skip_bits1(&gb); /* metadata_last */ mdt = get_bits(&gb, 7); -- 2.40.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".