ChafaSymbolMap: Fix crash when importing more than 32767 glyphs

The new limit is 2,147,483,646 glyphs. Any glyphs in excess of this limit will be silently discarded. Fixes #206 (GitHub).
hpjansson · Jul 17, 2024 · 04de1b9 · 04de1b9
1 parent bc1df29
commit 04de1b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/chafa/chafa-symbol-map.c b/chafa/chafa-symbol-map.c
@@ -1802,6 +1802,9 @@ chafa_symbol_map_add_glyph (ChafaSymbolMap *symbol_map,
  {
  Glyph2 *glyph2;
 
+ if (g_hash_table_size (symbol_map->glyphs2) >= G_MAXINT - 1)
+ return;
+
  glyph2 = g_new (Glyph2, 1);
  glyph2->c = code_point;
  glyph_to_bitmap_wide (width, height, rowstride, pixel_format, pixels,
@@ -1812,6 +1815,9 @@ chafa_symbol_map_add_glyph (ChafaSymbolMap *symbol_map,
  {
  Glyph *glyph;
 
+ if (g_hash_table_size (symbol_map->glyphs) >= G_MAXINT - 1)
+ return;
+
  glyph = g_new (Glyph, 1);
  glyph->c = code_point;
  glyph->bitmap = glyph_to_bitmap (width, height, rowstride, pixel_format, pixels);

diff --git a/chafa/internal/chafa-private.h b/chafa/internal/chafa-private.h
@@ -84,7 +84,7 @@ struct ChafaSymbolMap
 
 typedef struct
 {
- gint16 symbol_index;
+ gint symbol_index;
  guint8 hamming_distance;
  guint8 is_inverted;
 }