Fix segfaults

kayahr · Aug 20, 2012 · 6f28712 · 6f28712
1 parent 8052602
commit 6f28712
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/packfont/packfont.c b/src/packfont/packfont.c
@@ -148,14 +148,14 @@ static void storeFontGlyph(wlImages font, int index, gdImagePtr image)
     gdImageFilledRectangle(output, 0, 0, 8, 8, transparency);
     gdImageCopyResampled(output, image, 0, 0, 0, 0, 8, 8, gdImageSX(image),
             gdImageSY(image));
-    
+
     /* Copy pixels from image to pic */
     for (y = 0; y < 8; y++)       
     {
         for (x = 0; x < 8; x++)
         {
-            color = gdImageGetPixel(output, x, y);
-            font->images[index]->pixels[y * 8 + x] = color < 16 ? color : color | 0xf0;
+           color = gdImageGetPixel(output, x, y);
+           font->images[index]->pixels[y * 8 + x] = color < 16 ? color : color | 0xf0;
         }
     }
 
@@ -219,7 +219,7 @@ static wlImages readFont(char *inputDir)
     qsort(filenames, quantity, sizeof(char *), sortFilenames);
 
     // Build the font
-    font = (wlImages) malloc(172 * sizeof(wlImage));
+    font = wlImagesCreate(172, 8, 8);
     for (i = 0; i < 172; i++)
     {
         if (i < quantity)

diff --git a/src/unpackfont/unpackfont.c b/src/unpackfont/unpackfont.c
@@ -176,7 +176,7 @@ static void writePngs(char *outputDir, wlImages font)
 {
     int i;
     char *oldDir;
-    char filename[6];
+    char filename[8];
 
     oldDir = getcwd(NULL, 0);
     if (chdir(outputDir))