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: 52004 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b18c:0:b0:48e:c0f8:d0de with SMTP id q12csp524075vqn; Thu, 3 Oct 2024 10:34:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW2FS9MkHVHk6q/Fp+PI633GJVvsfa31MN5FX7b7kGfEKFfAKJJ+V/IadpocHXI/BVM5x8DfHBGSVj9Zp1R0U7J@gmail.com X-Google-Smtp-Source: AGHT+IF4rePjOB3o5QHgGfrRJCIFTIURLXng7dmLLOM4IKMQJeKFWem68E7Hmn+r+ja9UMmvhzub X-Received: by 2002:a05:600c:3c8b:b0:42c:ba83:3f08 with SMTP id 5b1f17b1804b1-42f777b00c6mr28388265e9.2.1727976894247; Thu, 03 Oct 2024 10:34:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727976894; cv=none; d=google.com; s=arc-20240605; b=c4d3rB9PdgKm7zPQqADU9bSoy5/SYFZ0RBNXvzWYrFhnrKRjqLbAK/ZSZSW+/k1hHD OyFOjyzAaIYCkBbm1eo+gtEv/r2X69m07RjdJJyCC4YHjDQWbwJd3j77XWGoF9zjUd/v p/XiNSp/S2Ah3IvwpFjuzpLV8nuN3mK4s8urV5qtbfaPhO0ok73QMDuG7b/xHk8xwEUX S2yYjmfnL6HDCqjxDoyt6EHqQofoWzUsZhChzRJpejDh2Jrzt6uprnMejQ6k8xw751N+ 2ZMRNmvatrO6zEEUcy3smadeC/do8uUIZnRamk4f2KCmrJzQIM6WbUrQ9nzh0RvBGoT5 h6Ow== 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=0exbIXl6CXExTQn0/aPib0bRLcMbJ/L72BBpwRyiPdo=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=f+UF7i5H8voCgWEeJ011AkomT1dxtiqbKW9mV7zDsNIBARDBV+R3TyoT+IS8NQa7GH Oejm1C26nwN+MZCf5etDEyccDpizoJOlpESuAZE3HwiKKx2JEYyzBi8W1Rv+lh5pjIEX S3u6OImUrM0ynx+0GMQL6okv2uzIhZjKHSqy8j/6fN/+0R7wt8Isdl3b371nDLQsUTLh dSczew/CGYTPcpXVnZTcnWRJ2MXgKNuIPv7UrKieoDNizUTgtoe0Oh1dGHY4sX+W4Qkc CgLLCcniW8jN/W8YbF0av6YdUVy6sokcRcKenOZvevgAyQaK8ztKW15du/dBldJy8hbT lkxw==; 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=P+8FidgP; 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 2adb3069b0e04-539a82a7f54si599618e87.500.2024.10.03.10.34.31; Thu, 03 Oct 2024 10:34:54 -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=P+8FidgP; 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 6931868DA34; Thu, 3 Oct 2024 20:23:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F47568B43D for ; Thu, 3 Oct 2024 20:23:26 +0300 (EEST) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-37cd8972738so948286f8f.3 for ; Thu, 03 Oct 2024 10:23:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727976206; x=1728581006; darn=ffmpeg.org; h=subject:date:from:to:message-id:from:to:cc:subject:date:message-id :reply-to; bh=FXF64Vtz+UGgDUQKphmz7scvE8768OkoxNDQymcwRmY=; b=P+8FidgPWKRaL+rOXk/f9FZICSpozDouILkCvBhZ5XLGuArdpVrnG8kEengipssFrl f08gKOItpACDWt4vRczLumeR5vxz2oF0oYlrUDCCwhUc8N0lICpHn6vkyZ3V+J6rYIN1 UfYEmsU7fns0MOnDuyPD3DiDnOqClloQB4jRWSz+YU+EC0TalvgT4sH+0zvFd5myJUxX ldfnElIpzZHBQmZC4+FFwp0aPn4igrEhUKSd4E8jb9W9sTLchAOFtQIUI47Gw8p3lyDM XaaSskdfNsCy0472KCNNTbE3JmDqVMKGRIi5fqOIjVL4VTv2F6I/6syCj0CuofvOyR3i vPJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727976206; x=1728581006; h=subject:date:from:to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FXF64Vtz+UGgDUQKphmz7scvE8768OkoxNDQymcwRmY=; b=rpAHUIV/IhxMVe1YTLQR+8i9OcYts7VULE4rZU6KeLGpxj8Kgw8Ll1UN0ewCemBKx5 DgybuFSEVZsSbrcyxE/TrE7RJ5uikL8r9ORuFJm3Cde0oNGoL6Pp3oXVR0pisO/csvqV ILk3W6pkmCbVWfUhXMSPoNh3MMdTLWfTqqoIXwh4mXcnk5mG9DkSO9PTisSZYJNKBzSU 4y6jFM8Y8dKiLVeexlBoJTMWgr2SXSEKSppmNJQM6YELsf/B6ugbLPewPB/uZhkSGeR4 9qahiahR8u0afMJO1GFt4hW6ZA7dQHZUxgYB4v50AjVZHUZbnOBqiAjyWHbLe6yT83Yp 6Bmg== X-Gm-Message-State: AOJu0YzG18nDR+OUi8Uldfphhx21w4J4sH7ng3HPVfvFG4zYp4pOGyWE Xy0NTDD+RiCX4nIu574bVmowpz+irV0hkGYvPMUENslUBPcaQ+W96YjfbA== X-Received: by 2002:adf:e841:0:b0:37c:c4b4:3396 with SMTP id ffacd0b85a97d-37d0e7680e0mr82952f8f.29.1727976205641; Thu, 03 Oct 2024 10:23:25 -0700 (PDT) Received: from localhost (p200300cccf324600cdc11a7284003a32.dip0.t-ipconnect.de. [2003:cc:cf32:4600:cdc1:1a72:8400:3a32]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f802b27fasm20175515e9.40.2024.10.03.10.23.23 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Oct 2024 10:23:24 -0700 (PDT) Message-Id: To: From: "Marvin Scholz" Date: Tue, 1 Oct 2024 02:57:11 +0200 Subject: [FFmpeg-devel] [PATCH v2 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: or060bGFtggW 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: 358fdf30838682f2b183e67d247e0d4d53b5a6a4 diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 2ff7c4c4f4..ddcd18dd15 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); } From patchwork Tue Oct 1 01:20:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 52003 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b18c:0:b0:48e:c0f8:d0de with SMTP id q12csp518189vqn; Thu, 3 Oct 2024 10:23:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX92yxkMzTsIYxVQzVsMml+8m/R5aL0jDgin631/eM8HHRzOL/OoxFjA6bSiz9nIq3BsujMkFLdOc3j1Fs2kEr+@gmail.com X-Google-Smtp-Source: AGHT+IHCVVt7uBkEPO/2RGeXokYQH9+g/2CtmCv1CLYK9aY0D0tId1+Uk1NcEiLtk0I7oN4F1WMG X-Received: by 2002:a2e:a99c:0:b0:2f1:75f4:a6c1 with SMTP id 38308e7fff4ca-2fae1025a45mr15300201fa.3.1727976231624; Thu, 03 Oct 2024 10:23:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727976231; cv=none; d=google.com; s=arc-20240605; b=RqxlF0wLO/6VOcJOhA6TtIvdH8XaKQ8tagXcHJUbVgZ0+m8kMSzMf6uWS1fiSZtwOt JZzbpyRkVQxp8e7x33c0p1pK3etblQI8LnRetgSyVXdSg7SCzALnPNSxm8ty7LjfRn8J QkZrv+EJkD5e8A1C2mSZYlt6sexe36+f60tCTKgN+AE1esrPIJIkEhCA3EelaZlRFkIs y9HW0hPF3V/+OU4OAbea3X8XFrHzalcjQkOzbldfLYHI2r+C4apboDW8EBVfnA/f7sC8 1ItxcBs10WgFG3CrZYkQRrkGHcXKioAsxhtDVtu0vHlFsX0wVlq4zkfTpesdIHwZf9Oa ROBQ== 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:in-reply-to :dkim-signature:delivered-to; bh=oRA92ZOUNs16Quhu4tO14l61Yb4BXu79IwLKBrzePEY=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=gGwQVZ8S/HUNBaRrApJJ3UurldMod4Og+7gLxNM0UI429UWyBxrI+IQFzHY2l4kJJw 10AkgIcJBKXvP5N3lQrHJJ72rWLVzkJbyWS2dbM99LbTB/bWQbBchBCU7C5IbdXDOIkD 7G5RvFPElTsHn1EvztxyG5+eC5ecDNJGQShtafF5gKAu3nFgCEFFhR9CPLcpDXvSoOjs 1G1A7ArH4JyJ5ZHFNqKUiYarDv+1PgbmJiGMdKqxzpePKbsCtU5t/VLU+VNdvD+AeZDj mxk9IMGv6M7l2IucrapB2KfN8kVw+tIbiUdDfReydw1JpWpKsqgY9xzCVTaS0Xkj81Et 3Skw==; 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=AEgceDbL; 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-2faecc6973esi5853011fa.350.2024.10.03.10.23.50; Thu, 03 Oct 2024 10:23: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=AEgceDbL; 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 9E9C868DA3C; Thu, 3 Oct 2024 20:23:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C73168D7CF for ; Thu, 3 Oct 2024 20:23:27 +0300 (EEST) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-42cb7a2e4d6so12439805e9.0 for ; Thu, 03 Oct 2024 10:23:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727976206; x=1728581006; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=qrFF5o5oho6Dv+26tWQ4W19JnAxMuDDu6OvnPz4HqrI=; b=AEgceDbLdUCerKh69OkR3tLBQeefPW9O6M9yO3BD4NJZSpC9wG+WTVXbKx9d1Vj5kf MVUr4ZUf8JeGZIFQOj1+rZGkYK4jxxEsSy6E9RbQb1Ov8xkPk6C6akpCxWkf4aZS7m0D rVdImI7WeCXXk24HClCrL6qhtFeOFaZoV6H7QcJV6auds2foPvBzeyTk/Jj0S+YG59Er hN4zJnnHTBMrZ/Tz2h/b2fCmXS0O5pv9ohGNsMGayTBcrQtqXygbaZOqw+njWkQgs2Pm eD663TZvkUhp8PITRHRfYHecQ3ZawBjqmvaLVzvSsatxlwAJT5X2vcddgqy8LZ6oeZ20 K68A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727976206; x=1728581006; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=qrFF5o5oho6Dv+26tWQ4W19JnAxMuDDu6OvnPz4HqrI=; b=mXRWRGUpnznnthfG810ax4SFRAWE0UVMCcQs0O763NG7UZckCqX78XxeO0eJ6YUSNS YQxq7lgWozTBUvrb636GllcXcP+fCJgBeR7i/ovYyt1CiitE1IVdzALYCE3pdmc6LFJO A3TZY1ORDSGx2fwRRN+ZoSqD9PanVNsPsW5ywD0JyLepp+hv5lcVhJ3JbCDVYWd3aFMr T2naT0JND3R3Y4DYNYOiaPNlWgioTs0g1SWFz7/O3aOaYp/ZxlmT/wPa0N0NlCRoXghC eLCSK+KwSP/cucQBM/1qukOJ9qRTtZM3XP/muUUhzFRA7toJF/yinkVFKJBvRSbQkh5+ rf/A== X-Gm-Message-State: AOJu0Yw/0n7QYpj/vI7QCC5cNiGw8ls9GQWLqz37/2lT2/rQvtg00D/o bB34One97PBjzCg8QIE+vxMh27UmCSIQZ479qjFUqD8yYs2HLLnolyjtvg== X-Received: by 2002:a05:600c:3b92:b0:42c:ac9f:b505 with SMTP id 5b1f17b1804b1-42f8426d8c0mr3451585e9.31.1727976206433; Thu, 03 Oct 2024 10:23:26 -0700 (PDT) Received: from localhost (p200300cccf324600cdc11a7284003a32.dip0.t-ipconnect.de. [2003:cc:cf32:4600:cdc1:1a72:8400:3a32]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f802b27fasm20175515e9.40.2024.10.03.10.23.25 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Oct 2024 10:23:26 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Tue, 1 Oct 2024 03:20:04 +0200 Subject: [FFmpeg-devel] [PATCH v2 2/2] fftools: log unconnected filter output label 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: OXzn7BBKmNH2 --- fftools/ffmpeg_filter.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index ddcd18dd15..b1ca710999 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1410,7 +1410,9 @@ int fg_finalise_bindings(void) OutputFilter *output = fg->outputs[j]; if (!output->bound) { av_log(fg, AV_LOG_FATAL, - "Filter %s has an unconnected output\n", output->name); + "Filter '%s' has output %d (%s) unconnected\n", + output->name, j, + output->linklabel ? (const char *)output->linklabel : "unlabeled"); return AVERROR(EINVAL); } }