From nobody Tue May 13 07:46:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZxT7m1CGRz5wVrY; Tue, 13 May 2025 07:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZxT7l6vyCz40nR; Tue, 13 May 2025 07:46:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747122404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FivBQmJfUEvX1FJkaQ0rW5pUcfz2/Tl3ODH16n0rVT8=; b=Fd+XUwxOKWORv8fddVOWMmIzwDUMpGa+zv6nyM270Tr+GnlnqHQbnzzpSh6Lzd4IApVMkb EQtiQh0cfXoami1BGbcJsPpfAKWaJ7acw7imwkTOj58Z2HrGyfsMYhMPyvyqeZDdavS/nC UBKbOtylCcZrbQmPla8y8cXBUQ5BacbypYQFjOoGltnlrmAOzxHjkVoFmWgzBCj1li/Zc9 Tqn7SACmAnAfuJQfoXxrjfaHa+CTFc7fkqbhoKt3UzmUjeIQscAfssVC2n4Un3dhsRIuDS 09Xj9YND3l7XGtbs7c71iUtN2goU9z4aDjxwcQzD3XyOI0hvH0U+D5nCH4u4nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747122404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FivBQmJfUEvX1FJkaQ0rW5pUcfz2/Tl3ODH16n0rVT8=; b=EyzOnErAbveXnKzvN0Nno2d9BQTTuncWQqvjkV2mq6qYMJeEElw6vWcCw9B3EWUrP1k7gn 68NXClGJpyt04JZFtIUCWRNGrmhTQ1nWxEDGzFlBojPLTWPimL9kLYGSMSIvjIjl6p0wbp GaIdtFwXH2LmjFTByeThQtmoX/LF/gWdZlZQcGjZEpN1mEWjAcpiWzsNgtTLtCiBflHhJJ ScPZpqanhi4jDmuS2zMwGCBfAApYMEOVoKjrXqzaVbkcpEPTezrxJhynpBXxeQ0NuLwV0L w+EzlMFNEpf+Nf0XzPPjbgBQe0I6WE4b3qtCTUDATS5LXzLgscurjQCcgBdy9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747122404; a=rsa-sha256; cv=none; b=kbwdXWmGsB16fTJNVu39Ur4PQBxGySjLYT0fFPW6wbhWhPg+iNj6Z5lxnjgzZMZg3T+Don 3n+obvddcRCtXUGZbs+w/irj5p6nBVY96Lgz10Gei9s9ng7WrYr2Li1EWC4Mqa9EahaY6z 7seGysLEozDbXlykh0ee1gB/Mswa98kruTuOlcUeTA7X4ecFdOOFMjZXnnxgqPffcbjSON 8qCE8QSwW4fNxthfZeNRUt326huzPF6Uqrxs7Tyzlko+R9z5N1lLHnVK8yp+28Z+v+P621 otDQUz5hWYM7YtBgR/k3owWYLVHhP9O+Y8ZYOTKN878anhygzKEGGClNbz5isA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZxT7l6C3czd5l; Tue, 13 May 2025 07:46:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54D7khCU010141; Tue, 13 May 2025 07:46:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54D7khTN010139; Tue, 13 May 2025 07:46:43 GMT (envelope-from git) Date: Tue, 13 May 2025 07:46:43 GMT Message-Id: <202505130746.54D7khTN010139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Toomas Soome Subject: git: 3bcf8e6db8e9 - main - loader: loader can pick too large font (check if one side is larger) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3bcf8e6db8e9b30af0a1d445e6e413a332066434 Auto-Submitted: auto-generated The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=3bcf8e6db8e9b30af0a1d445e6e413a332066434 commit 3bcf8e6db8e9b30af0a1d445e6e413a332066434 Author: Toomas Soome AuthorDate: 2025-05-13 07:40:39 +0000 Commit: Toomas Soome CommitDate: 2025-05-13 07:44:35 +0000 loader: loader can pick too large font (check if one side is larger) The 5e25f7b09977 still allows one side to be too large, fix it. --- stand/common/gfx_fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index ad38a657e233..af72ab1a4c99 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -2082,7 +2082,7 @@ gfx_get_font(teken_unit_t rows, teken_unit_t cols, teken_unit_t height, * Skip too large fonts. */ font = fl->font_data; - if (height / font->vfbd_height < rows && + if (height / font->vfbd_height < rows || width / font->vfbd_width < cols) continue;