From patchwork Sat Jun 18 19:16:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36322 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp811209pzb; Sat, 18 Jun 2022 12:18:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sMYW0toaSs26UGGyr54GFjhF2WCdQ8n0BuSPv2UXPfsMyFDhavC2hiLDoZ7iL71jTow7oz X-Received: by 2002:a17:906:7297:b0:712:56de:3c43 with SMTP id b23-20020a170906729700b0071256de3c43mr14083277ejl.549.1655579927068; Sat, 18 Jun 2022 12:18:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655579927; cv=none; d=google.com; s=arc-20160816; b=tNXlVeMbfDJ1EFpz26YGQ7pltJ9kf9W7mqcU50RzdLaUNlZx3xda/oMNdYvZTaaBsr PWPbtw8MctcvljIrsjyqEbM4HIvUuGmdBWqmetPi1mFOqwfHaaf6mOJhPRFuhX1czOHz Wam7nAF7q9R+4vZWHfYJkEhW+7aAdGuBWwyoemG7psfz7wy4imm4bqKJjbnK37XbDxwh IlqvJ1bDPkUkAuuuhIAGTQUsoAachaHq/0TqDnthNLVYZVij7oT44MPvYxjYTqUNWhEe hb93agCgoqp7VC+GWSFIMU7UdbZTH4sniI1NzbGOotvj9U1Odg3nbUp5i1zP/KOf7w60 llaQ== 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=8KvF8wngkc7vG2B4sv27uXF3/Obdk8aN815OgeiBBQI=; b=gH7BvJatE193a4dk1uwnJSfjSAy/RfC6ABG7O+V/A3QCQA3cqNvUyortIYeVPqOW4B zG9nUCcwvMFXmgkKol7EcyRwi+4Vm7NF7K6lzk2JzOD2jfiYNBXXMPwIvzlbZgH2yX3b +x1vgBW8rIXc8ibc1UqdAlE+7kkdRUxze8yqdM/htD/AWIix8WANbMV5bS4H9blFglvB ZPjvxbqSqLMmG/kAeF+v47CgXkjOtvGYCMx4ADn2qWFrq5+uLoPsLT9SM21fWQfWjIUF Eb79dcyxuWZM8THAwnsSOLIZSG2uzx67CDLQIxSEa2RA1e7jSeXnXp0bnSVqwaUHhEF9 iIhQ== 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 h25-20020a50cdd9000000b004357897e3b8si270567edj.175.2022.06.18.12.18.46; Sat, 18 Jun 2022 12:18:47 -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; 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 A699F68B566; Sat, 18 Jun 2022 22:18:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D78468B3C7 for ; Sat, 18 Jun 2022 22:18:38 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o2dxu-002WM3-0L for ffmpeg-devel@ffmpeg.org; Sat, 18 Jun 2022 21:18:38 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 2dwuoXWCl8s8U2dwwokQgf; Sat, 18 Jun 2022 21:17:38 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id 2dvyodUdZOPqF2dvyoqw1K; Sat, 18 Jun 2022 21:16:38 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=62ae2496 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=D2vUUIruARFot66U00kA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 18 Jun 2022 21:16:35 +0200 Message-Id: <20220618191637.16712-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220618191637.16712-1-michael@niedermayer.cc> References: <20220618191637.16712-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfEv489bfrr3i25dHhaHkVKbKi33XpnvubnJeJhqeKgxLtQTNMad9ZhyqXqWwmhgWiplqDuypmEYSmQCm4rDGSkQz4Q9cFL4QCHG4w5KkKT+v/LlS5M5Q 0A6Wgx5Ckh9JDzbYG+93NNwZ6qag1QLnAt7Bw23WBF/29L+VsLjMkbSIjFvrcm7VdgH6SPsGPTiIIQ== Subject: [FFmpeg-devel] [PATCH 2/4] avformat/mov: Add special case for slow duplication loop in mov_read_trun() 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: ZA456/1UT9oy This extra code is ugly, better solution is welcome Fixes: Timeout Fixes: 45700/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-6141847792123904 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index c93e13c8cd..3d9e866d4e 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5092,6 +5092,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (index_entry_pos > 0) prev_dts = sti->index_entries[index_entry_pos-1].timestamp; + if (flags & 0xF00) { for (i = 0; i < entries && !pb->eof_reached; i++) { unsigned sample_size = frag->size; int sample_flags = i ? frag->flags : first_sample_flags; @@ -5166,6 +5167,74 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) sc->nb_frames_for_fps ++; } } + } else { + unsigned sample_size = frag->size; + unsigned sample_duration = frag->duration; + + if (pts != AV_NOPTS_VALUE) { + dts = pts - sc->dts_shift - sc->time_offset; + av_log(c->fc, AV_LOG_DEBUG, + "pts %"PRId64" calculated dts %"PRId64 + " sc->dts_shift %d ctts.duration %d" + " sc->time_offset %"PRId64 + " flags & MOV_TRUN_SAMPLE_CTS %d\n", + pts, dts, + sc->dts_shift, 0, + sc->time_offset, 0); + } + + if (av_sat_add64(dts, sample_duration * entries) != dts + (uint64_t)sample_duration * entries) + return AVERROR_INVALIDDATA; + + for (i = 0; i < entries && !pb->eof_reached; i++) { + int sample_flags = i ? frag->flags : first_sample_flags; + int keyframe = 0; + int index_entry_flags = 0; + + if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) + keyframe = 1; + else + keyframe = + !(sample_flags & (MOV_FRAG_SAMPLE_FLAG_IS_NON_SYNC | + MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES)); + if (keyframe) { + distance = 0; + index_entry_flags |= AVINDEX_KEYFRAME; + } + // Fragments can overlap in time. Discard overlapping frames after + // decoding. + if (prev_dts >= dts) + index_entry_flags |= AVINDEX_DISCARD_FRAME; + + sti->index_entries[index_entry_pos].pos = offset; + sti->index_entries[index_entry_pos].timestamp = dts; + sti->index_entries[index_entry_pos].size = sample_size; + sti->index_entries[index_entry_pos].min_distance = distance; + sti->index_entries[index_entry_pos].flags = index_entry_flags; + + sc->ctts_data[index_entry_pos].count = 1; + sc->ctts_data[index_entry_pos].duration = 0; + index_entry_pos++; + + av_log(c->fc, AV_LOG_TRACE, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", " + "size %u, distance %d, keyframe %d\n", st->index, + index_entry_pos, offset, dts, sample_size, distance, keyframe); + distance++; + dts += sample_duration; + offset += sample_size; + sc->data_size += sample_size; + + if (sample_duration <= INT64_MAX - sc->duration_for_fps && + 1 <= INT_MAX - sc->nb_frames_for_fps + ) { + sc->duration_for_fps += sample_duration; + sc->nb_frames_for_fps ++; + } + } + + } + + if (frag_stream_info) frag_stream_info->next_trun_dts = dts + sc->time_offset; if (i < entries) {