vcl/unx/generic/gdi/freetypetextrender.cxx | 1 -
1 file changed, 1 deletion(-)
New commits:
commit ff6e505399c127bededc275ac179470072ab5d97
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Aug 26 16:32:42 2025 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Aug 26 15:41:51 2025 +0200
Related: tdf#145967 Drop incorrect assert
Fonts are externally provided, untrusted resources. Since commit
fdd24dabb6f8c520e8307bacab2bd8b09ebc763d (tdf#145967: Initial support
for docs with restricted embedded fonts, 2025-08-12), more fonts from
documents get handled; that happened to uncover e scenario, where a
corrupted font was rejected in FreeTypeTextRenderImpl::SetFont after
failing TestFont(); and then, FreeTypeTextRenderImpl::GetTextLayout
was called (the problematic document was attachment 161580 from bug
133637). Thanks Caolán for catching this - see
https://gerrit.libreoffice.org/c/core/+/189366/comments/c231c296_c2c2a6d8
Change-Id: I83a116cc9e082884b9d41782ba779bad650ab1b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190220
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/vcl/unx/generic/gdi/freetypetextrender.cxx
b/vcl/unx/generic/gdi/freetypetextrender.cxx
index 4fae167f234c..2bb595af6821 100644
--- a/vcl/unx/generic/gdi/freetypetextrender.cxx
+++ b/vcl/unx/generic/gdi/freetypetextrender.cxx
@@ -192,7 +192,6 @@ void FreeTypeTextRenderImpl::GetFontMetric(
FontMetricDataRef& rxFontMetric, int
std::unique_ptr<GenericSalLayout> FreeTypeTextRenderImpl::GetTextLayout(int
nFallbackLevel)
{
- assert(mpFreetypeFont[nFallbackLevel]);
if (!mpFreetypeFont[nFallbackLevel])
return nullptr;
return std::make_unique<GenericSalLayout>(*mpFreetypeFont[nFallbackLevel]);
