Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 May 2025 07:46:43 GMT
From:      Toomas Soome <tsoome@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 3bcf8e6db8e9 - main - loader: loader can pick too large font (check if one side is larger)
Message-ID:  <202505130746.54D7khTN010139@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by tsoome:

URL: https://cgit.FreeBSD.org/src/commit/?id=3bcf8e6db8e9b30af0a1d445e6e413a332066434

commit 3bcf8e6db8e9b30af0a1d445e6e413a332066434
Author:     Toomas Soome <tsoome@FreeBSD.org>
AuthorDate: 2025-05-13 07:40:39 +0000
Commit:     Toomas Soome <tsoome@FreeBSD.org>
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;
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505130746.54D7khTN010139>