From patchwork Tue Oct 1 00:57:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51949 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:a303:0:b0:48e:c0f8:d0de with SMTP id v3csp91844vqm; Mon, 30 Sep 2024 18:20:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWPfvB7lOsJM2OHZBlZ3csolEFB/clqRKwBP8MhTh+0dEcShNXck1LNxiugjchmGJCJ09/hDyvAh+n5YqFthbA+@gmail.com X-Google-Smtp-Source: AGHT+IHGabmuM/rYsVkHeXJyqeQk/epqatAG4dvcu+28UYsKPbn7c19NamLoRQOLUR7TFKVOXM4H X-Received: by 2002:a2e:be1b:0:b0:2f7:66ce:a319 with SMTP id 38308e7fff4ca-2fabff736e1mr16124021fa.9.1727745651036; Mon, 30 Sep 2024 18:20:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727745651; cv=none; d=google.com; s=arc-20240605; b=GoFtTOpIWuFdZcIzWvL9t7WY+nC72blzvDrXhv+4ZL1pjggPh/FsPrRPpvYA1SJstK 6wug+n1xflgwPSuxzK426wAvotWiR82FD4seaQERxwLkb1LvUoWI+iT3szCIjx7H+04g jYj9AFuerhPSKYf2aSag6bYaSh+6ZYEAb1CwUkSFFPxR6yslGuQOXl/WC+fEkTT2Umvf 8nwktlJvkh2ogTuQdaHQjTxa0BoGZCy5zBTQO720G/Pw52cOfhFv5TX2tQHIV9G7EouR 1nVmWDnkhCvW1DUutvRF0MMX9e433xk3k0/PDkUMp2T9ec45MgpYhUdNJ+EBKYFovYUL Ke1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:date:from:to:message-id:dkim-signature :delivered-to; bh=BHSq8rV6rZpWSk285GigFI/utJziXT+D4AOXzhWSKUM=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=PlTH0LRpO89bwnJYR9Isb8FwMErREWqEhbUCwPsPMkkNXMrhvf47/O+O9gWTHrqtpa tuUwv5qv7KBW5j9o3DcB46I8ihdw8bImFegU74no8NHKZirfv2XIQ7rIZ45qSTOHQhCC hqeUbj2zplcuvSK8SjejHMrHZvJ7rKSm9aVnvVcvZgTblwxQwBNwPcN19DcuKD9LX/PW T6px+ok7GMko2U4kRcUz+gKExeprOXvT7h8MYb1EghsOTKSpuj9SDQGPhTCSjocjRDHD 62noMjAT3D+vihzC6cXFhlKR1E60KbLmbgerOhEj5+tod8FlbL1OoSu7Kp7nST0MJT2B LhaA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=V9DQK9f3; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2fac0887fc1si20029811fa.411.2024.09.30.18.20.50; Mon, 30 Sep 2024 18:20:51 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=V9DQK9f3; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3123D68D9B5; Tue, 1 Oct 2024 04:20:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D06068D0FE for ; Tue, 1 Oct 2024 04:20:40 +0300 (EEST) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-37ccfba5df5so3216941f8f.0 for ; Mon, 30 Sep 2024 18:20:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727745640; x=1728350440; darn=ffmpeg.org; h=subject:date:from:to:message-id:from:to:cc:subject:date:message-id :reply-to; bh=39ZaBQf0HMP0QvMVex6ZAfAreaL9fGGCn6MJhyTyWn8=; b=V9DQK9f3+4zfyiv4GbSZwcc2fkznKjHPucyD12TMscZ9QotDbW24yj5Y3vWj7c4Vbq qz/MpQcpORaVQWzXpPNq5shx783cXRlm/hf9OWVt5RZvehLdSIept6X9sk+avTSF88kr LrrNTLYvqS+Y5zYflfTVMHqb0+ov3xOsfge1ume2TjayAiq6l6UudFlBVh/OBXRf9/rQ Jh/J+ao/fO+y64lZ/J06+Mh4BrJ6bTtZtrutEd0TElcf6I2kkt8ihJuC/oa1dSqY8ykr sS3bOabDPIkDJX9knXBEsSEwfhTGm4NF1TZ4BNbvJhj5iwit6+hKLVdtWegdaMsUZ7Q/ uLaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727745640; x=1728350440; h=subject:date:from:to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=39ZaBQf0HMP0QvMVex6ZAfAreaL9fGGCn6MJhyTyWn8=; b=HvM9y8BhealMH0PgTtHo9Yudyy3Dv4bzaVb7LJ7HQjP6MsFQJ+ttC6IprZD39ez/aP ++VE5Q4UmaPIPo/rQWTI2s9pkLkk9ewwiDeHyHQH3KKAoNU1sMMFhip5JBtokFg9qbtf 867Z+JMDo/815+/yF4agUwiwFbnm3mGgvsZL788zp98zvp8pG00quX6emVvfaMT9gqeR aa9xrLkXq8kQgttP7W//LoYmI9RsmgJb1BSp1QKQkqckNgeamUYQJqyx19yui+dqrUx1 NDydKN1j9Wq3/Xz4eKAfG9krV32pRG1oQX4X3nKk0LQEz0Ds4GFHOXIiWN47G13PyfP5 i6jQ== X-Gm-Message-State: AOJu0Yx0SY2qz/lnptGRnqITxVYquiTHafuAotXWd8afINp2xIc1CcGf 7QZUaSO+Zr29oC6r30Y6kQ5RG/vyRHfJCKt8YlIAp61nXmdn9iK3Xw75Eg== X-Received: by 2002:adf:f841:0:b0:37c:cfba:d16b with SMTP id ffacd0b85a97d-37cd5b1e23dmr8390733f8f.44.1727745639535; Mon, 30 Sep 2024 18:20:39 -0700 (PDT) Received: from localhost (p200300cccf32460015b779d5a2149bb1.dip0.t-ipconnect.de. [2003:cc:cf32:4600:15b7:79d5:a214:9bb1]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37cd564ce91sm10688511f8f.2.2024.09.30.18.20.37 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 30 Sep 2024 18:20:37 -0700 (PDT) Message-Id: To: From: "Marvin Scholz" Date: Tue, 1 Oct 2024 02:57:11 +0200 Subject: [FFmpeg-devel] [PATCH 1/2] fftools: do not access out of bounds filtergraph 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: w7pjoYum3LDm The log message was logged for `filtergraphs[j]` which would cause a heap buffer overflow in certain circumstances. Correctly it should be logged for the current filtergraph, so just use `fg` here. --- fftools/ffmpeg_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 545de54e3e0ce5ad1285aa5e111e6657ad803f79 diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 463245d9b0..e9271e74ed 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1409,7 +1409,7 @@ int fg_finalise_bindings(void) for (int j = 0; j < fg->nb_outputs; j++) { OutputFilter *output = fg->outputs[j]; if (!output->bound) { - av_log(filtergraphs[j], AV_LOG_FATAL, + av_log(fg, AV_LOG_FATAL, "Filter %s has an unconnected output\n", output->name); return AVERROR(EINVAL); }