From 9e4ff668f4469824df5c418681ca11a4d640932c Mon Sep 17 00:00:00 2001
From: WillyJL <49810075+Willy-JL@users.noreply.github.com>
Date: Sun, 10 Nov 2024 05:08:52 +0000
Subject: [PATCH] Asset Packer: Fix font terminator causing freezes/crashes
 (#295)

* Asset Packer: Fix font terminator causing freezes/crashes

* Update changelog
---
 CHANGELOG.md            | 1 +
 scripts/asset_packer.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0047dfb45..21fc015e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -200,6 +200,7 @@
   - OFW: Fix detection of GProx II cards and false detection of other cards (by @Astrrra)
   - OFW: Fix Guard GProxII False Positive and 36-bit Parsing (by @zinongli)
   - OFW: GProxII Fix Writing and Rendering Conflict (by @zinongli)
+- Asset Packer: Fix font terminator causing freezes/crashes, like in Marauder AP scan/list (#295 by @Willy-JL)
 - Desktop:
   - Fallback Poweroff prompt when power settings is unavailable (by @Willy-JL)
 - Sub-GHz:
diff --git a/scripts/asset_packer.py b/scripts/asset_packer.py
index dda625fc3..6f3187d77 100755
--- a/scripts/asset_packer.py
+++ b/scripts/asset_packer.py
@@ -119,6 +119,7 @@ def pack_font(src: pathlib.Path, dst: pathlib.Path):
                     .decode("unicode_escape")
                     .encode("latin_1")
                 )
+        font += b"\0"
         dst.with_suffix(".u8f").write_bytes(font)
     elif src.suffix == ".u8f":
         if not dst.is_file():