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 61A594D102 for ; Wed, 10 Dec 2025 01:51:50 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'qP57r11qalnAIt2PwMa2JlYY2Ys49vvKW+yIcdZNZjc=', expected b'a18JFNIV/AjhbRCnbi6HNvNguDF0JazcNTn3Uf//XTQ=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1765331501; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=qP57r11qalnAIt2PwMa2JlYY2Ys49vvKW+yIcdZNZjc=; b=rY359UJgkwi77Pyuw0PDyKvWyTqIKQ59llKhiKBpWk8F559VZNzkS2COFGQ63xsFpySWT CAd/9I7TdtUXDRPnNrQpRxWqi0W/GTD43xCO/vwKZpgq5Ypo0O1buK6tnMb0aSu4Kz0FmDU 7wZfXD7uvEjMkSqcl1p/XVI0wkv1vLrf6Me23B0bERphoZtWpj3uRUqeArEpEopi1Rcfrmz 4cCJcTEnZtVP595Evbqzbn1+e2MdOiU37fGIsWOMnVM7ZZznz8iGqqgtrAUet45Pp87EQ99 LSwmP9m+tFm8REwpiAg8g5bFxj4QAs0YgWYDWl5vUY4F9koM+sLzc0F+nJ0Q== Received: from [172.19.0.3] (unknown [172.19.0.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id B2775690720; Wed, 10 Dec 2025 03:51:41 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1765331485; b=qgeqvghGmAeOy83A9rGGp3OMOoY5UOY31EtpJQMohW0RgIqQIKr0nOB4sN8Ummjluknxy vg5VqGH2LZ4M+4Ucfh3vn/SrWwUljqSkLNWLFa1yL2GSZ5+pcsttET9CUwd/UYEUuy+AH3k o8zdgtHJVcxBp56P7VNrpP89Sg1C6nSb5kg1H5dj5y+zcCzG3NRnp7cM/kGX9r4cTdNInR7 F1lHKIBDzoTex1EjfsOLmMtnAWOXJr4RamqwWrPdIS+0If5hLmAluYevyEjgqqN4zJpSBKO GQvr6sN3FxMr0bG5A//PvqcADnndCVbiHoSrsfM87Dq98auT3mSjfaMM3W5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1765331485; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=XQbm+jLWNwiU8WwlqbO8Wh46ZCP3ix4yyFE2VOj54Xs=; b=ipmrixELIvaboLTxpiyzg9Ljvr7J2TOfZrJj8KhTR5fU+604XWuyxpRfiLQzlY9hZFdND aCOAG0xyrxMr8+qcyBlPtLhU4khYuX4AS637RbOVwtHmaCgSkga4WjjEw4/XwqnSVRrEVgR PdDCDHMMkjmMKtE65CjBD9kXMS3AKo2//ZkNz9XA0Ua64xKHSIIzQFdAogvTyFdkri3dONo wUu6mFim8QY7pvOWW80hG4HUG7ovCeF5Lg/ajoyRJdQY+BwnKs6XqLmkvbogyqoHM7qkmhE bx0VAo1BClLoLCCol6P088sRtr2jy22gYd15rwOBSZidud7FldFwvW443ang== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1765331478; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=a18JFNIV/AjhbRCnbi6HNvNguDF0JazcNTn3Uf//XTQ=; b=HevU1t2aXKJgiaqPFE1pSmOVhEgyyZ0w4EBWGWkAoX6HfBf9WzX7mhLCOCgBrsEtcM61X PcXI+es+HhvjtMeefBDBFyDKTpgsJpRtrxa2MQHrwgYMt1av3SQdYqQigl3XZyDIVb6RwcN qAydcMwYJ1BNm+fQPyLC1UeqSdDOikLyBR08+vg+JKUQbFIDhI+BgFUDD/6ocHcD5ByajVg MJmU5pkXHJydE3h+vSENvpMSo28Lnb4a87fnoIHsyuf9+i0vKwKQZ6Vo6HgWdFZLkB0zdmh FGLrTB6UBcpt8Kn2wDlqpzPlOwX+/kzHtlyzSx4w+KnnRD3SQqAzdersBKZQ== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 523B76904FB for ; Wed, 10 Dec 2025 03:51:18 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Dec 2025 01:51:17 -0000 Message-ID: <176533147842.39.8616138307112165612@2cb04c0e5124> Message-ID-Hash: NVQ7KRJWFGQ4PLEDLA3HFQTBK5YFZRT5 X-Message-ID-Hash: NVQ7KRJWFGQ4PLEDLA3HFQTBK5YFZRT5 X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avfilter/drawvg: limit recursion depth in VGS parser (PR #21151) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: ruikai via ffmpeg-devel Cc: ruikai Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21151 opened by ruikai URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21151 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21151.patch Prevents stack overflow with deeply nested repeat/if/proc blocks. Originally reported via ffmpeg-security; this patch incorporates feedback from Kacper Michajlow. >>From 1178b51f2ae88ddd4045561b98f4030eb08a531a Mon Sep 17 00:00:00 2001 From: Ruikai Peng Date: Wed, 10 Dec 2025 01:41:14 +0000 Subject: [PATCH] avfilter/drawvg: limit recursion depth in VGS parser Prevents stack overflow with deeply nested repeat/if/proc blocks. --- libavfilter/vf_drawvg.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_drawvg.c b/libavfilter/vf_drawvg.c index 5d3008084c..97e5583366 100644 --- a/libavfilter/vf_drawvg.c +++ b/libavfilter/vf_drawvg.c @@ -242,6 +242,8 @@ struct VGSParameter { // for the arguments. #define MAX_PROC_ARGS (MAX_COMMAND_PARAMS - 2) +#define VGS_MAX_RECURSION_DEPTH 1024 + // Definition of each command. struct VGSCommandSpec { @@ -435,6 +437,7 @@ struct VGSParser { const char **proc_names; int proc_names_count; + int depth; ///< Current recursion depth while parsing subprograms. // Store the variable names for the default ones (from `vgs_default_vars`) // and the variables created with `setvar`. @@ -1232,6 +1235,7 @@ static void vgs_parser_init(struct VGSParser *parser, const char *source) { parser->proc_names = NULL; parser->proc_names_count = 0; + parser->depth = 0; memset(parser->var_names, 0, sizeof(parser->var_names)); for (int i = 0; i < VAR_U0; i++) @@ -1264,11 +1268,20 @@ static int vgs_parse( int subprogram ) { struct VGSParserToken token; + int ret = 0; memset(program, 0, sizeof(*program)); + parser->depth++; + if (parser->depth > VGS_MAX_RECURSION_DEPTH) { + av_log(log_ctx, AV_LOG_ERROR, + "Exceeded maximum drawvg block nesting depth (%d)\n", + VGS_MAX_RECURSION_DEPTH); + ret = AVERROR(EINVAL); + goto out; + } + for (;;) { - int ret; const struct VGSCommandSpec *cmd; ret = vgs_parser_next_token(log_ctx, parser, &token, 1); @@ -1286,7 +1299,7 @@ static int vgs_parse( FFSWAP(int, program->proc_names_count, parser->proc_names_count); } - return 0; + goto out; case TOKEN_WORD: // The token must be a valid command. @@ -1304,21 +1317,26 @@ static int vgs_parse( if (!subprogram) goto invalid_token; - return 0; + goto out; default: goto invalid_token; } } - return AVERROR_BUG; /* unreachable */ + ret = AVERROR_BUG; /* unreachable */ + goto out; invalid_token: vgs_log_invalid_token(log_ctx, parser, &token, "Expected command."); fail: vgs_free(program); - return AVERROR(EINVAL); + ret = AVERROR(EINVAL); + +out: + parser->depth--; + return ret; } /* -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org