From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 5EED450026 for ; Mon, 7 Jul 2025 10:31:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 8807068FA5B; Mon, 7 Jul 2025 13:31:11 +0300 (EEST) Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 63BD268FA5B for ; Mon, 7 Jul 2025 13:31:04 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id A179843B01; Mon, 7 Jul 2025 10:31:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1751884263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=BMhvfPMTekaUGhgi7KkPd6nT2laC3Be07JqJnNlR9xE=; b=gE7g7rCx/vosYijqRcP3OF3y1mpu3eEmwXmfrDeCuWhYZJwHWKy7oZudifZZ7HjZeq5Lfh WalxIpT2XHOIGsHsWWVgN37VWclwUGD2lOvKTJPW5BvCMEv67MA6id16VjvvI2lxTfsEKG XB8Ben2p5MPaYlzfSGZjb3gwsx3OZyqBNrVf23N+Df87aa/qsmM8yogeIax2kg5S/T/qOr dIsulXpW/S3yuFZO9TZ+lIdhIwyJutEiY6LqKZIdxCltF18MkixaUETzG28zkP7X7z7DQR 2L8mhbPS1kRxcKGKhslHjC7s4r8MIXbd7CH6zwMoAYgF0+bIS3Se71Yq1wXb/Q== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 7 Jul 2025 12:31:01 +0200 Message-ID: <20250707103102.3477457-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-GND-State: clean X-GND-Score: -70 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdefudehiecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfitefpfffkpdcuggftfghnshhusghstghrihgsvgenuceurghilhhouhhtmecufedtudenucesvcftvggtihhpihgvnhhtshculddquddttddmnegfrhhlucfvnfffucdlfedtmdenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpeffueelgfeuvedvheehvddvhfdulefhudfhieffhfduvedvfffhjefftedtjedvleenucfkphepgedurdeiiedrieeirddvvdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieeirddvvdejpdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepvddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhgpdhrtghpthhtohepuggrnhhishhjihgrnhhgsehgmhgrihhlrdgtohhm X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/2] avformat: Add recursion limit 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: Yuhao Jiang 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: This is a generic recursion limit that is not specific to a demuxer it does change public API which makes this unsuitable for backporting Fixes: self_ref.ffconcat Reported-by: Yuhao Jiang Signed-off-by: Michael Niedermayer --- libavformat/avformat.c | 5 +++++ libavformat/avformat.h | 9 +++++++++ libavformat/options_table.h | 1 + 3 files changed, 15 insertions(+) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 18ca4643eec..dca46395ac7 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -844,6 +844,11 @@ int ff_copy_whiteblacklists(AVFormatContext *dst, const AVFormatContext *src) *(char **)((char*)dst + offsets[i]) = dst_str; } } + if (src->recursion_limit <= 0) { + av_log(dst, AV_LOG_ERROR, "Too deep recursion\n"); + return AVERROR(ELOOP); + } + dst->recursion_limit = src->recursion_limit - 1; return 0; } diff --git a/libavformat/avformat.h b/libavformat/avformat.h index b6c63e22376..ef1cf5d5a76 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1884,6 +1884,15 @@ typedef struct AVFormatContext { * @see skip_estimate_duration_from_pts */ int64_t duration_probesize; + + /** + * Depth recursion limit, + * + * The maximum recursion depth that a Demuxer can open a Demuxer within itself. + * + * - demuxing: Set by user + */ + int recursion_limit; } AVFormatContext; /** diff --git a/libavformat/options_table.h b/libavformat/options_table.h index e2e690fd2ae..8275570dae6 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -106,6 +106,7 @@ static const AVOption avformat_options[] = { {"skip_estimate_duration_from_pts", "skip duration calculation in estimate_timings_from_pts", OFFSET(skip_estimate_duration_from_pts), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, D}, {"max_probe_packets", "Maximum number of packets to probe a codec", OFFSET(max_probe_packets), AV_OPT_TYPE_INT, { .i64 = 2500 }, 0, INT_MAX, D }, {"duration_probesize", "Maximum number of bytes to probe the durations of the streams in estimate_timings_from_pts", OFFSET(duration_probesize), AV_OPT_TYPE_INT64, {.i64 = 0 }, 0, INT64_MAX, D}, +{"recursion_limit", "Maximum number of times a demuxer can recursively be opened", OFFSET(recursion_limit), AV_OPT_TYPE_INT, {.i64 = 10 }, 0, INT64_MAX, D}, {NULL}, }; -- 2.49.0 _______________________________________________ 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".