Changeset 1150 for toilet/trunk/src/figlet.cTweet

Timestamp:

Sep 30, 2006, 7:53:59 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Fixed a lot of memory leaks and added a few error checks.

File:

• toilet/trunk/src/figlet.c (modified) (5 diffs)

toilet/trunk/src/figlet.c

@@ -29 +29 @@
 #include "figlet.h"
 
+#define STD_GLYPHS (127 - 32)
+#define EXT_GLYPHS (STD_GLYPHS + 7)
+
 struct figfont
 {
@@ -139 +142 @@
                                    (font->glyphs + 2048) * 2 * sizeof(int));
 
-        if(font->glyphs < 127 - 32)
+        if(font->glyphs < STD_GLYPHS)
         {
             font->lookup[font->glyphs * 2] = 32 + font->glyphs;
         }
-        else if(font->glyphs < (127 - 32) + 7)
+        else if(font->glyphs < EXT_GLYPHS)
         {
             static int const tab[7] = { 196, 214, 220, 228, 246, 252, 223 };
-            font->lookup[font->glyphs * 2] = tab[font->glyphs + (127 - 32)];
+            font->lookup[font->glyphs * 2] = tab[font->glyphs - STD_GLYPHS];
         }
         else
         {
             char number[10];
-
-            fscanf(f, "%s %*[^\n]", number);
+            int ret = fscanf(f, "%s %*[^\n]", number);
+
+            if(ret == EOF)
+                break;
+
+            if(!ret)
+            {
+                free(data);
+                free(font);
+                fprintf(stderr, "read error at glyph %u in `%s'\n",
+                                font->glyphs, path);
+                return NULL;
+            }
 
             if(number[1] == 'x')
@@ -175 +189 @@
 
     fclose(f);
+
+    if(font->glyphs < EXT_GLYPHS)
+    {
+        free(data);
+        free(font);
+        fprintf(stderr, "only %u glyphs in `%s', expected at least %u\n",
+                        font->glyphs, path, EXT_GLYPHS);
+        return NULL;
+    }
 
     /* Import buffer into canvas */
@@ -181 +204 @@
     cucul_free_buffer(b);
     free(data);
+
+    if(!font->image)
+    {
+        cucul_free_canvas(font->image);
+        free(font);
+        fprintf(stderr, "libcucul could not load data in `%s'\n", path);
+        return NULL;
+    }
 
     /* Remove EOL characters. For now we ignore hardblanks, don’t do any
@@ -215 +246 @@
 static void free_font(struct figfont *font)
 {
+    cucul_free_canvas(font->image);
     free(font->lookup);
     free(font);