From patchwork Tue Feb 8 20:23:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34192 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1123673iov; Tue, 8 Feb 2022 12:25:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJyEBai6xScKlSlQ76RuWkFf2NIBNhZ9/k7O+jJuxOtVI180jfJx6mhjgRbUAMN+TUiWM4QP X-Received: by 2002:a17:907:9615:: with SMTP id gb21mr5012317ejc.404.1644351905888; Tue, 08 Feb 2022 12:25:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644351905; cv=none; d=google.com; s=arc-20160816; b=RRxLwZFGgIQDs3QSHBRgROUb+JUvLH4vEiCFfrbx3gNXMTOpHqz9Af9X6mn5bv7j/7 7S/5lwzN8SIvUShXCjEGlj2ElW7MnlI+UBRlWK2HLpHkDqJBhuExOyGYkyk1jPagyQV6 GfK16rYV7p4KnWJQO0vcNACUpfS0SwtaIaS7tJsJRtTnqOezhrWMy5gx94LLwVX5lud+ g63whP0fMECnnuIZPEnqW7mlcSFL/qd0xUS8+Tsr6i+OGKFlwehH634H4QhS+IhMbJ/0 IprhLF0DquEoSb6A6rKgj7UCkJksB1NPvmt9oXv5DenjHJomWIOHS4pA7UnU7M2572oJ IiXg== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=+VLdNYDYYy7DW47jaMTlnSc6H9mv21NJ6mYGu2DRyCU=; b=Mr/U8h+r0vtHIr3RySwVoiHG/lSfYT1lkNx0JnQefZNtGTJkfzCqYXYnWcbf1+ocFG BAtUNEEX7DDAKrFOL+jW7DCmkDMc3Gmbw7C080BQDHGYH5vA/hjVCK9MqkzOF/asNd+v nEXvFr+lQFEH80J+Sx50tIT5DVKP8yNbNqPjOPV4R4b4XAD0vIh6/xhlLBNBFKn+Gho6 LDoj6SVFZBRQnx+KhDBCoha7ZhWHuqiQo9wE/RizAgggu3qujI7nxjfv6e+sU9l6dDYl EFwHVtKO1/dQRqHvM7lZH3g1iqwL0wJe/ERxWMfNjR6FYOttE4k7qE4zlO/f9wA5Jn2l jiSA== ARC-Authentication-Results: i=1; mx.google.com; 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 p12si10096276ejy.969.2022.02.08.12.25.05; Tue, 08 Feb 2022 12:25:05 -0800 (PST) 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; 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 6195168B03F; Tue, 8 Feb 2022 22:25:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0868E68AECE for ; Tue, 8 Feb 2022 22:24:55 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nHX2k-007N5A-07 for ffmpeg-devel@ffmpeg.org; Tue, 08 Feb 2022 21:24:54 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id HX1mnDgrkSgGFHX1mnJawd; Tue, 08 Feb 2022 21:23:54 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=c5rDy1oKR3LvIXi_9goA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 8 Feb 2022 21:23:53 +0100 Message-Id: <20220208202353.19554-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220208202353.19554-1-michael@niedermayer.cc> References: <20220208202353.19554-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfJsz68hyVP3aX2L8YvCDzbtL125/WF4F/DPIk7zVnVQmsqVnq7/Q8RKx0DyKYrYet+cU5rMggtUxZs96GBl4gI6J8iHw+t90TFgoSRsbfvjtkbVjI5wm g8TFzZSGEDm1K0Bdrf6fP3IJpeMA65s7vIiQLwnkpkdJmEmAbeG+AC67 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/demux: Count EAGAIN as 100 bytes in relation to read limit in avformat_find_stream_info() 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: WS+ojm+YhJO+ Fixes: Timeout Fixes: 43717/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5206008287330304 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/demux.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index dd42d32710..1acba0c608 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -2590,8 +2590,10 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) /* NOTE: A new stream can be added there if no header in file * (AVFMTCTX_NOHEADER). */ ret = read_frame_internal(ic, pkt1); - if (ret == AVERROR(EAGAIN)) + if (ret == AVERROR(EAGAIN)) { + read_size += 100; continue; + } if (ret < 0) { /* EOF or error*/