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 6A8EA40B19 for ; Fri, 4 Feb 2022 03:29:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BFC8268B265; Fri, 4 Feb 2022 05:29:26 +0200 (EET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075066.outbound.protection.outlook.com [40.92.75.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0CF568B1AA for ; Fri, 4 Feb 2022 05:29:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fiRFCOlbNwuGrO468h73i7aMLwWTMr7PUjHqLRr8SgRDZ63iFEwq83ashqoxydZtcUz9FqHREO1C0icrbrgp7BqXGZD76N6jZz4XfBABmMZ/zBbMgGeE212aJdxQuIvJGdDB5GCriFPexmOsKEsYHHJApYGrMt5+86FwHkPkpLGLcmRdagrhhoLlT0jfktHl3gX2ArApvtT8STRoEmO6TDOIzJ/fVbZFP2NzZYhjGD8Q1ubNcJX59G4VVQH2pvqZJCqQM2xlxmmfLCD/9ademiVGWCHQl7/zuJTkh8biibckoOX7RJIbffOruLrBz2eZ8OUMXi/6ZgGu2GhLrdz1+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WUaAE9mQV8cb+VzZODX+nSEKNZKyKDWT/zglBE8aY5Y=; b=jB0joPSliI53JbmIlN1BU80SB5IRUCPZqt6skSKzMisYgqcBZiYmcZ1t9PmE+hJwRuhmV7lsTO2XL4bk8/97Np8W0R2oLneLeCSvBpFOuCZ1X9qrMr2s/wL9yLtMLLzqc3KmErhIbm+vOzsKssVh87hY2Nxn4bv9FAJwVFSjmXtGwHAe7EbwxSZd9jI8TFJ9+8CrGgcQxeWX8Xc0YeNzccjhEcBz6LuupPNuAmMunQfaZQPv8BZQwZoUhy1eKTSsOkObCa7ysxIez2m2cylzsONpvEHixs5yRXIdcEVMA1hO7oOI/f5F9tyvnQOMHiIw0s/gX7Il5sH4N0VfFMH8mg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WUaAE9mQV8cb+VzZODX+nSEKNZKyKDWT/zglBE8aY5Y=; b=GJDhujidBY9feCoOf1PZmZkFEuaAvdzuMFAY8OGj+D7CpHyO7UhzHtnwn+2LgFMT5lL4vuqx870cNuS3/5ZP+QlIX+f9xHNua4hShlYFQR77UgXhPUQ5ykiyEXeQyStsZ0zMMyDKbBaSMkCQOI8g/zKbsftvvcwaujBhH25UtiEKeIlBCoiEC12d5r9+966DYhK2XDw/KGta4rvtNythm2Tgcpphpd9e7uv5T0FesrfwJFHi9kFbG+Foa3aGeUweUIyl+0S6fOc5EB6lVRR8tNdHqUAvpd4CE8SDS5AIpHoxSQc/jFccdh6qV8lUNcJ0GdFgp87PZQ3kpTz8U0mnzA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7494.eurprd03.prod.outlook.com (2603:10a6:20b:2e2::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Fri, 4 Feb 2022 03:29:19 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4951.014; Fri, 4 Feb 2022 03:29:19 +0000 Message-ID: Date: Fri, 4 Feb 2022 04:29:18 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220204005811.5459-1-michael@niedermayer.cc> From: Andreas Rheinhardt In-Reply-To: <20220204005811.5459-1-michael@niedermayer.cc> X-TMN: [TrSzQVO+yVXnJaa4vaw++QxVrAtvCUBs] X-ClientProxiedBy: AS9PR04CA0058.eurprd04.prod.outlook.com (2603:10a6:20b:46a::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <13750243-c0a4-9775-cec6-b1009293413b@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8e54aa24-0b73-4ecd-3f7a-08d9e78e8772 X-MS-TrafficTypeDiagnostic: AS8PR03MB7494:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TViU4Ua+IQPK4i/H/jEMSRe7JetimwPDDRwyd+knYmN+GXujQf4/LoQVCJYHVssffVHQM/xKTipMRz2gPDFmXGjRO+BPnZcxtHyU1tURNbmEIhjp82QcSofpNB9GgIORJ67lJ9BjB1PsvFKaciSquh7AnxyBFAsJ91s4j/NC+jaD1cXl/kIYOvHz0u61ExX8Vhovd/jNH47uS+jc5ClVka/bJUZETS72qra3CH0ZnsbzSBsM/oFTj5whSwWo+RsSCaK2UmzjPaEGLvH1vEPGZPI2XKzFCloX7QaxQRI1Q9HAU80jA8JDLJHW+6TAo/ijbx4oSVUTRNkE5VRleN2p2bBbIIj2I1COCIN2RA8eidgsJdtmfBBYtw6R+pL1lGXBmAFmOTDeXDFVnVtbvikanI2O99h+Lo3Soz8uhGPQ28aqqJ0L2sqlEX1qWZ0R35v7bxQCPyuaRQPWkpNl7DlzHEmL5HHTYveuQin0W7kshoLDxEjOC5jc+sL77LVFdS/MhOKgzpJnTMyMZGLVw7R8TFegohYF8kaSqbHhXhdYUE3VbdyNw7zu2F6d5rZN/O24Pk872IylPvD67dU5Oe7PD7daF192D0ebCb0aOtISpFJgTYtVmNtfdywgX9L5bY5R X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?S2Q4Qk5SZFRFN1o4WTdjVTkzRlJjMHFBemp2bC9mSFpFbTZxTTd3dXc1ZjFE?= =?utf-8?B?R0ovdjJreENUbFVwa1FOMFM5OGp3Sy9aYkE5NTZIcjJCemQ1bkU1b3hyRGFO?= =?utf-8?B?Uy9tenlKV3kxKy80WmZyL3JTTDlzc2VzcTRCNFVoQTh0Z2F6Q21nNEd6eFhm?= =?utf-8?B?czY1M1R1ekx5QTRlTXFGdmo5Q2FPdU5iSFdQYVJoWUZMR0l3RlhyWEhaNzZT?= =?utf-8?B?UmpnZGFScUprUjExVlRVWWpQYmQzY3pwN3B1eTRiMTVqV2RQUmxGMnNxMXVs?= =?utf-8?B?Qit5N0JGUzd1VTBEQU9DekhOZWhwRCtsQzlxUWVEcmJkeGoyaXVDaDRMb0pX?= =?utf-8?B?YUJwVGRYcHFpRnpmUjNKcDQ5c0d5ZTFMZytuUllFYmVvWmdtYWJUVTBtcTJ2?= =?utf-8?B?ejRnNmVpTzdjVk4yUklhWEhQVG8vbU1oMTMyeUttVXBWYjcvSlBmT3N6U3ZE?= =?utf-8?B?Y0FzWklzcHhEelVHdDE4VHM0amt5UWNRQnNST2pwWkFORmt0emlzTmdBbzMr?= =?utf-8?B?cUs0M2hMMXJsdHg4SUdMbS8vUHRuMXJNZy9DR1QxeEdjRCtSVmdKSzdiVklW?= =?utf-8?B?aExFYW5rNEx2Q0tNTUwrOGY4SGdwc3RGUjQ1Tm9TSUpnOEdCRVB4OFpHWnZt?= =?utf-8?B?MTRra053cmhQSEZzN0c1RVN4ZVZreDBjbVZ4VExsOE5aYXVnYmFtSlFSdEtZ?= =?utf-8?B?V01xLzI4dTVlR0lKajdMZ1RCUjljTjRYK29qaVpCK2lsWUo2Vnk3Z1Rkbnhn?= =?utf-8?B?TUVmL2dlOU5rVnB2djBYblBrZHI3WUxjTVphRUIrcHBCelR1K2hHZFhPNWky?= =?utf-8?B?R0kyeFZHNUFBaFAyYTFKalY4SkhXeitQZmRtVk9BRGs5QWhYK2tEUUR4U3hJ?= =?utf-8?B?ejROZU4xWnpLakpydmk4WGdtUU5ia1Jxc0VPWXdTMWc5N2hmTU9MWjFQUmhm?= =?utf-8?B?clNVUnRXYlVWckh1UkRDQmwvSVNCQnRDdUhyQ0F4YThJdEJ5YjJxK011aG9k?= =?utf-8?B?emsyRWNTZ3RHV0FuNHFxT3JwSzg5U29lMjhXRW02NGpEbUkwNW9EZjEwNDl3?= =?utf-8?B?N050bG9IMk5DSlliRHp6OFdUb0c4aTB6QmZqd0RLb095UnZ4dk5BaUFodElW?= =?utf-8?B?bHhuZjliSUJmY2pneUw3ZjVTcnZ1S1hzNXhzWW9pSWRVa2FyM1JNUndHOWhp?= =?utf-8?B?bVhmcGMrYzBrb255ay9DRVpNcmxZc2N4SXVTY0ZLVThkTUtJMENBRFBlMjNp?= =?utf-8?B?UDMvQWoxU0Y2ZmVGa2c2YnNGeDJ6ZmEremJXdU9XYUVVdXdrZz09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e54aa24-0b73-4ecd-3f7a-08d9e78e8772 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2022 03:29:19.5294 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7494 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avformat/matroskadec: Fix infinite loop with bz decompression 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 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: Michael Niedermayer: > Fixes: Infinite loop > Fixes: 43932/clusterfuzz-testcase-minimized-ffmpeg_dem_MATROSKA_fuzzer-6175167573786624 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer > --- > libavformat/matroskadec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c > index d165f6ab90..5a9acfb247 100644 > --- a/libavformat/matroskadec.c > +++ b/libavformat/matroskadec.c > @@ -1742,7 +1742,7 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size, > case MATROSKA_TRACK_ENCODING_COMP_BZLIB: > { > bz_stream bzstream = { 0 }; > - if (BZ2_bzDecompressInit(&bzstream, 0, 0) != BZ_OK) > + if (!pkt_size || BZ2_bzDecompressInit(&bzstream, 0, 0) != BZ_OK) > return -1; > bzstream.next_in = data; > bzstream.avail_in = isize; I see nothing in the zlib-API manual that would preclude this from happening with zlib, too, so it should be checked there, too. LGTM apart from that. - Andreas _______________________________________________ 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".