Don't crash when trying to load a non-existent vector/bitmap character.

solvespace · Jan 2, 2017 · d893277 · d893277
1 parent 02ab358
commit d893277
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/resource.cpp b/src/resource.cpp
@@ -497,8 +497,10 @@ const BitmapFont::Glyph &BitmapFont::GetGlyph(char32_t codepoint) {
             mid--;
         }
 
-        // Read the codepoint.
         ASCIIReader reader = { mid, unifontData.cend() };
+        if(reader.AtEnd()) break;
+
+        // Read the codepoint.
         char32_t foundCodepoint = reader.Read16HexBits();
         reader.ExpectChar(':');
 
@@ -724,8 +726,10 @@ const VectorFont::Glyph &VectorFont::GetGlyph(char32_t codepoint) {
             mid--;
         }
 
-        // Read the codepoint.
         ASCIIReader reader = { mid, lffData.cend() };
+        if(reader.AtEnd()) break;
+
+        // Read the codepoint.
         reader.ExpectChar('[');
         char32_t foundCodepoint = reader.Read16HexBits();
         reader.ExpectChar(']');