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 157BC4F40C for ; Thu, 26 Feb 2026 00:24:42 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'/+qQEixEqCw2HArfpLglRSArGuKg7AkBtZ9Lb8Cq1ks=', expected b'OLqfdcQB4seuntquvAEOm+yfbKp2yDBYnZoRAUawfRM=')) 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=1772065456; 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=/+qQEixEqCw2HArfpLglRSArGuKg7AkBtZ9Lb8Cq1ks=; b=GepNa2YCyJur4iBHpNFtNudknRziY+tsvqBg5ZRJ+0l7c3iK9lZ7BOEeLOB7JYxoxB9HQ qyJPuNC4WwldowhPEVqQK1rVHcZ0ckdIM8Z3EKHNIJMayRUta4YVqNJHg1fOb7QcG36r/Ak KsFtQybnifHuTZW8LkL4azSI8VhPxb/HuovnkYqdgCI8Wi5DtHLj2ktvYSkg7KM/QHE2Ulk Nev2isNCcP83H3fMIa12ZndwY8ckfcJkuLePUyaUByxdQsKPYpf3Le2CYmNZ80zfVdvFKs/ EqfjtqSv4mLghLlkj3WiTVhiYGK9bWE3t6KKNfZCSdH81zFeMLu82iAchI7A== Received: from [172.18.0.3] (unknown [172.18.0.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 42E4F691324; Thu, 26 Feb 2026 02:24:16 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1772065441; b=isWpPMJMBaC/UMiLtBBB4+LsQw0tRElkyMY/t1ZVQ3aeTGFnP1Q0sySkTqZfeVvShrsG+ OqDImC+erpcUwRm8vDMTEGzRuMcq4dfZnTedjb625bX73kkQjIBTeiBzgzPkKa1QY2ZC/dB C9H/xn8NFIrOFEK6svYS5EX9qczRzgnNQL5BIkeH+QgUPSrW4cUjmvmuCBp9L0gsTmCMDnK R0/P7y4uccgEGxqxAstt3SuZi2yA9piI1iopPCRdJXipY6o5MOij+/rFHNPbDX3dnmsWFHt NYL0E/uMhfykoQqVXWKSpEMqVIJ6b8TsSNmonS2ObpXyBMCtU4nSL3bIkmDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1772065441; 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=7kEYMgmcOqqx6hRkHdCw7xg/fHnMQp7FB8aKUQDt00k=; b=SHVRCZeF/AQ62j5Oc4/JoWvozh5zEaxsuiAW2VIaCgJHMvR+2+m8g7rv4vY5PcCzHDigm IHDvRZmikNuz40MK990IxpYTB/AGrjMBKMOgXy0Aaquaoxb2xW8I2nIcrlc+T8m/ZkVpUkO cpQ6gt9Z0lGZOrogN7WD4dK++BIV9WODcCjFy7SrFRZTDqNd6Fmy5hgh68l+s+eEgL0UrsQ LbzTKEAjnYk4PvwnQtMAOv7TQtMXeqpgS6OEQ590t3VgyB2na2P8X9xWhRVcbD8pTyVnN2w vfeqMqBqPlVQOfpujqqtWyUov9uR6F2wD2ZvlQdkOvoRUq00PgiLT1Si/vkQ== 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=1772065429; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=OLqfdcQB4seuntquvAEOm+yfbKp2yDBYnZoRAUawfRM=; b=w9UrBdsq2G9zBpPsB6TH8GYtO3GWnssrRpKJu0ULGzi1NcefjOGrC+wECvHeTf0FlgOG6 vQ+WM5osOtGgwoBzS6AfPPc+OmtUnLfONY1koCKknArrbtyTeg0FBTX6UvSFq9QoJMFZeLs Am01OVKzedlNxRaJ8K+Oi4eosRVA41WdXQN1zP6eMAJj8z0lkfkup0j6jXoPgY0VupEeFnq TbI/0xm9M9LeW/dfpKQ/YdoNExOtpv5+FdWixGTyNhWRs34okgONQxDYa6u1GFW195Z36PL O1nY1CEia2RDTX6EG5bD+ZxBW8PUaSWhqXHRUmKnPMfh+74v2IV1hwQdGmYg== MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Feb 2026 00:23:49 -0000 Message-ID: <177206542987.25.13269513663935286216@29965ddac10e> Message-ID-Hash: KGHJPONRCGZK6YI6QWOKQOWJQKTRVPWF X-Message-ID-Hash: KGHJPONRCGZK6YI6QWOKQOWJQKTRVPWF 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] [PR] avutil/eval: Check depth of AVExpr (PR #22286) 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: michaelni via ffmpeg-devel Cc: michaelni Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #22286 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22286 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22286.patch we already check the depth of the parser but the AVExpr tree differs Fixes: stack exhaustion Fixes: YWH-PGM40646-39 Found-by: jpraveenrao Signed-off-by: Michael Niedermayer >>From b9313d585f0377ca84da050aa99a5801b172944a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 26 Feb 2026 00:36:42 +0100 Subject: [PATCH] avutil/eval: Check depth of AVExpr we already check the depth of the parser but the AVExpr tree differs Fixes: stack exhaustion Fixes: YWH-PGM40646-39 Found-by: jpraveenrao Signed-off-by: Michael Niedermayer --- libavutil/eval.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavutil/eval.c b/libavutil/eval.c index 8069ed88a2..c40b381aae 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -40,6 +40,8 @@ #include "avstring.h" #include "reverse.h" +#define MAX_DEPTH 100 + typedef struct Parser { const AVClass *class; int stack_index; @@ -176,6 +178,7 @@ struct AVExpr { struct AVExpr *param[3]; double *var; FFSFC64 *prng_state; + int depth; }; static double etime(double v) @@ -430,13 +433,16 @@ static int parse_primary(AVExpr **e, Parser *p) av_expr_free(d); return ret; } + d->depth = FFMAX(d->depth, d->param[0]->depth+1); if (p->s[0]== ',') { p->s++; // "," parse_expr(&d->param[1], p); + d->depth = FFMAX(d->depth, d->param[1]->depth+1); } if (p->s[0]== ',') { p->s++; // "," parse_expr(&d->param[2], p); + d->depth = FFMAX(d->depth, d->param[2]->depth+1); } if (p->s[0] != ')') { av_log(p, AV_LOG_ERROR, "Missing ')' or too many args in '%s'\n", s0); @@ -529,6 +535,9 @@ static int parse_primary(AVExpr **e, Parser *p) static AVExpr *make_eval_expr(int type, int value, AVExpr *p0, AVExpr *p1) { + int depth = FFMAX(p0->depth, p1->depth) + 1; + if (depth > MAX_DEPTH) + return NULL; AVExpr *e = av_mallocz(sizeof(AVExpr)); if (!e) return NULL; @@ -536,6 +545,7 @@ static AVExpr *make_eval_expr(int type, int value, AVExpr *p0, AVExpr *p1) e->value =value ; e->param[0] =p0 ; e->param[1] =p1 ; + e->depth = depth; return e; } -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org