File mlfc-Fix-crash-with-more-than-1024-font-faces-i... of Package mlterm

Overview Repositories Revisions Requests Users Attributes Meta

File mlfc-Fix-crash-with-more-than-1024-font-faces-installed.patch of Package mlterm (Revision 1ff3520597bd00203de4fb30390f9ca6)

Currently displaying revision 1ff3520597bd00203de4fb30390f9ca6 , Show latest

From f14cc7562629ed0af118cfbbf28b985e8b1c4b3c Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Sun, 26 Feb 2023 13:31:45 +0100
Subject: [PATCH] mlfc: Fix crash with more than 1024 font faces installed

Use realloc to allocate the font pointer array rather than a fixed size.

Fixes: #58
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 tool/mlfc/main.c | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/tool/mlfc/main.c b/tool/mlfc/main.c
index f32a0ccc..25af3e8e 100644
--- a/tool/mlfc/main.c
+++ b/tool/mlfc/main.c
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h> /* alloca */
+#include <stdbool.h>
 #include <sys/stat.h>
 #ifdef __sunos
 #include <alloca.h>
@@ -418,8 +419,9 @@ static int check_font_config(const char *default_family /* family name */
   const char *path;
   const char *default_path;
   FcPattern *pattern;
-  FcPattern *matches[1024];
-  u_int num_matches = 0;
+  FcPattern **matches = malloc(sizeof(*matches));
+  u_int num_matches = 1;
+  bool did_search = false;
   int b_idx;
   struct {
     struct unicode_block *block;
@@ -439,7 +441,7 @@ static int check_font_config(const char *default_family /* family name */
   FcPatternPrint(pattern);
 #endif
 
-  matches[num_matches++] = search_next_font(pattern);
+  matches[0] = search_next_font(pattern);
 
   if (*default_family == '\0') {
     if (FcPatternGet(matches[0], FC_FAMILY, 0, &val) == FcResultMatch) {
@@ -454,34 +456,36 @@ static int check_font_config(const char *default_family /* family name */
   }
 
   for (b_idx = 0; b_idx < sizeof(blocks) / sizeof(blocks[0]); b_idx++) {
-    int m_idx;
+    u_int m_idx;
 
     for (m_idx = 0;; m_idx++) {
       FcCharSet *charset;
 
       if (m_idx == num_matches) {
-        if (num_matches == sizeof(matches) / sizeof(matches[0]) ||
-            matches[num_matches - 1] == NULL) {
+        if (did_search)
           break;
-        }
+        matches = realloc(matches, sizeof(*matches) * (num_matches + 1));
 
         if (!(matches[num_matches] = search_next_font(pattern))) {
-          int count;
+          u_int count;
           FcPattern *pat = FcPatternCreate();
           FcObjectSet *objset = FcObjectSetBuild(FC_FAMILY, FC_FILE, FC_CHARSET, NULL);
           FcFontSet *fontset = FcFontList(NULL, pat, objset);
+          matches = realloc(matches, sizeof(*matches) * (num_matches + fontset->nfont));
 
           for (count = 0; count < fontset->nfont; count++) {
-            matches[num_matches++] = fontset->fonts[count];
-            FcPatternGet(matches[num_matches - 1], FC_FAMILY, 0, &val);
+            matches[num_matches + count] = fontset->fonts[count];
+            FcPatternGet(matches[num_matches + count], FC_FAMILY, 0, &val);
 #if 0
-            fprintf(stderr, "Add Font List %s\n", val.u.s);
+            fprintf(stderr, "%u Add Font List %s\n", num_matches + count, val.u.s);
 #endif
           }
-          matches[num_matches] = NULL;
+          did_search = true;
+          num_matches += fontset->nfont;
+        } else {
+          num_matches++;
         }
 
-        num_matches++;
       }
 
       if (!matches[m_idx]) {
-- 
2.39.2

Places

File mlfc-Fix-crash-with-more-than-1024-font-faces-installed.patch of Package mlterm (Revision 1ff3520597bd00203de4fb30390f9ca6)

Places