Skip to content

qt6-base: fix segfaults due to freetype failing glyph rendering #61042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mnabid wants to merge 1 commit into
base: master
Choose a base branch
from
+57 −5
Open

qt6-base: fix segfaults due to freetype failing glyph rendering #61042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions srcpkgs/qt6-base/patches/fix-test-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Remove unused QtTest/QTest header from relocatable_change.h
# Fixes build failure with -DQT_BUILD_TESTS=ON

--- a/tests/auto/corelib/kernel/qvariant/relocatable_change.h
+++ b/tests/auto/corelib/kernel/qvariant/relocatable_change.h
@@ -8,7 +8,6 @@
#endif

#include <qvariant.h>
-#include <QtTest/QTest>

#include <type_traits>
38 changes: 38 additions & 0 deletions srcpkgs/qt6-base/patches/freetype-Handle-failing-glyph-rendering.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From 1b4f4b1797bc7db3eea6ef83a34df61d7bf78e17 Mon Sep 17 00:00:00 2001
From: David Edmundson <davidedmundson@kde.org>
Date: Wed, 25 Mar 2026 15:32:10 +0000
Subject: [PATCH] freetype: Handle failing glyph rendering

When FT_Render_Glpyh fails the slot returns a bitmap containing a valid
width and height but a null buffer.

When we eventually memcpy this buffer we will crash. Existing error
handling in this method returns null on errors.

Pick-to: 6.8 6.10 6.11
Fixes: QTBUG-145310
Change-Id: I4737ab4d769b52f42bd1ef9037c8b9fd681a4ae8
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
---

diff --git a/src/gui/text/freetype/qfontengine_ft.cpp b/src/gui/text/freetype/qfontengine_ft.cpp
index e331a4c..371e01d 100644
--- a/src/gui/text/freetype/qfontengine_ft.cpp
+++ b/src/gui/text/freetype/qfontengine_ft.cpp
@@ -1955,11 +1955,13 @@
FT_Library_SetLcdFilter(slot->library, (FT_LcdFilter)lcdFilterType);

err = FT_Render_Glyph(slot, renderMode);
- if (err != FT_Err_Ok)
- qWarning("render glyph failed err=%x face=%p, glyph=%d", err, face, glyph);
-
FT_Library_SetLcdFilter(slot->library, FT_LCD_FILTER_NONE);

+ if (err != FT_Err_Ok) {
+ qWarning("render glyph failed err=%x face=%p, glyph=%d", err, face, glyph);
+ return nullptr;
+ }
+
info.height = slot->bitmap.rows;
info.width = slot->bitmap.width;
info.x = slot->bitmap_left;
12 changes: 7 additions & 5 deletions srcpkgs/qt6-base/template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# - rebuild all pkg with qt6-base-private-devel
pkgname=qt6-base
version=6.10.2
revision=1
revision=2
build_style=cmake
configure_args="-DINSTALL_DATADIR=share/qt6
-DINSTALL_ARCHDATADIR=lib${XBPS_TARGET_WORDSIZE}/qt6
Expand Down Expand Up @@ -79,7 +79,8 @@
tst_qx11info tst_qcomplextext
tst_qaddpreroutine tst_qtextcursor
test_widgets_app_deployment tst_qnetworkinterface
tst_qgraphicsproxywidget tst_qdnslookup"
tst_qgraphicsproxywidget tst_qdnslookup
tst_qsavefile tst_inputcontext"
# Unknown platform linux-g++ :/
failing_tests+=" mockplugins test_import_plugins
test_static_resources test_generating_cpp_exports"
Expand All @@ -88,16 +89,17 @@
failing_tests+=" tst_seatv4"
# cmake
failing_tests+=" test_qt_add_resources_rebuild test_collecting_plugins
test_standalone_test test_qt_extract_metatypes"
test_standalone_test test_qt_extract_metatypes RunCMake.Sbom"
# Failing readonly and out-of-memory
failing_tests+=" tst_qsharedmemory"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
# Some glibc specific DNS Lookup
failing_tests+=" tst_qdnslookup"
failing_tests+=" tst_qdnslookup tst_json tst_qarraydata"
fi
if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
# failing on i686, not checked on arm
failing_tests+=" tst_qvectorrnd tst_json tst_qvectornd tst_qdoublevalidator"
failing_tests+=" tst_qvectorrnd tst_json tst_qvectornd
tst_qdoublevalidator tst_largefile tst_qpainterpath"
fi
local ctest_exclude="("
for failure in $failing_tests; do
Expand Down Expand Up @@ -127,7 +129,7 @@
HostArchData=lib/qt6
Data=share/qt6
HostData=share/qt6
Sysroot=

Check failure on line 132 in srcpkgs/qt6-base/template

View workflow job for this annotation

GitHub Actions / Lint templates

Template Lint 

variable set to empty string: 	Sysroot=
SysrootifyPrefix=false
TargetSpec=linux-g++
HostSpec=linux-g++
Expand Down
Loading