Make sure nb_bitmap_char is initialized

LedgerHQ · Oct 4, 2023 · 429b7dd · 429b7dd
1 parent 73c3b0a
commit 429b7dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/bolos/fonts_info.c b/src/bolos/fonts_info.c
@@ -197,6 +197,11 @@ void parse_fonts(void *code, unsigned long text_load_addr,
     nb_fonts = fonts_size / 4;
   }
 
+  // There is no font or we don't know its format
+  if (!nb_fonts) {
+    return;
+  }
+
   // Checks that fonts & nb_fonts are coherent
   if (fonts[nb_fonts] != nb_fonts) {
     fprintf(stdout, "ERROR: Expecting nb_fonts=%u and found %u instead!\n",

diff --git a/src/launcher.c b/src/launcher.c
@@ -541,10 +541,8 @@ static int run_app(char *name, unsigned long *parameters)
   app = get_current_app();
 
   // Parse fonts and build bitmap -> character table
-  if ((app->elf.fonts_addr != 0) || (hw_model == MODEL_STAX)) {
-    parse_fonts(memory.code, app->elf.text_load_addr, app->elf.fonts_addr,
-                app->elf.fonts_size);
-  }
+  parse_fonts(memory.code, app->elf.text_load_addr, app->elf.fonts_addr,
+              app->elf.fonts_size);
 
   /* thumb mode */
   f = (void *)((unsigned long)p | 1);