mkfont: make bmfont parser more resistant

DragonMinded · Jun 24, 2024 · 29c5a64 · 29c5a64
1 parent 4d245dd
commit 29c5a64
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/tools/mkfont/mkfont.cpp b/tools/mkfont/mkfont.cpp
@@ -78,6 +78,7 @@ void print_args( char * name )
     fprintf(stderr, "                             glyphs in the font.\n");
     fprintf(stderr, "   --monochrome              Force monochrome output, with no aliasing (default: off)\n");
     fprintf(stderr, "   --outline <width>         Add outline to font, specifying its width in (fractional) pixels\n");
+    fprintf(stderr, "\n");
     fprintf(stderr, "BMFont specific flags:\n");
     fprintf(stderr, "   --format <format>         Specify the output texture format. Valid options are:\n");
     fprintf(stderr, "                             RGBA16, RGBA32, CI4, CI8 (default: RGBA16)\n");

diff --git a/tools/mkfont/mkfont_bmfont.cpp b/tools/mkfont/mkfont_bmfont.cpp
@@ -94,7 +94,9 @@ char* tokenize_bmfont_line(char *line_in)
         line += strspn(line, " \t\r\n");
         if (!*line) return NULL;
         char *key = line;
-        line += strcspn(line, "="); *line++ = '\0';
+        line += strcspn(line, "="); 
+        if (!*line) return NULL; // ignore keys without value
+        *line++ = '\0';
         return key;
     } else {
         line += strspn(line, " \t\r\n");