From ecdba747bb665ca96d75bbda41f6a61bd6826076 Mon Sep 17 00:00:00 2001 From: Leonard Hecker Date: Thu, 25 May 2023 20:21:55 +0200 Subject: [PATCH] AtlasEngine: Fix nullptr crash when using soft fonts (#15419) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Woops. Regressed in #15343. Fixes #15409. ## Validation Steps Performed * Run `RenderingTests.exe` * Soft fonts work ✅ (cherry picked from commit 245b13b94e9f82fab86a3d8b2762ad7a6600203f) Service-Card-Id: 89323212 Service-Version: 1.18 --- src/renderer/atlas/BackendD3D.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/renderer/atlas/BackendD3D.cpp b/src/renderer/atlas/BackendD3D.cpp index 6e26a2cbdad..6415160454d 100644 --- a/src/renderer/atlas/BackendD3D.cpp +++ b/src/renderer/atlas/BackendD3D.cpp @@ -1145,6 +1145,11 @@ void BackendD3D::_drawTextOverlapSplit(const RenderingPayload& p, u16 y) void BackendD3D::_initializeFontFaceEntry(AtlasFontFaceEntryInner& fontFaceEntry) { + if (!fontFaceEntry.fontFace) + { + return; + } + ALLOW_UNINITIALIZED_BEGIN std::array codepoints; std::array indices;