about summary refs log tree commit diff
path: root/lib/ppmdfont.c
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2009-04-25 22:18:30 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2009-04-25 22:18:30 +0000
commit7c5533aefcce459b4df82ea12c763471f45d4169 (patch)
treedba2eddc2c2e074f7053eeae536ecdbf55552adf /lib/ppmdfont.c
parent26bd087379a449407b7f2b22ab2432edd8f6f06d (diff)
downloadnetpbm-mirror-7c5533aefcce459b4df82ea12c763471f45d4169.tar.gz
netpbm-mirror-7c5533aefcce459b4df82ea12c763471f45d4169.tar.xz
netpbm-mirror-7c5533aefcce459b4df82ea12c763471f45d4169.zip
Don't ignore error reading font file
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@890 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'lib/ppmdfont.c')
-rw-r--r--lib/ppmdfont.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/ppmdfont.c b/lib/ppmdfont.c
index a378f79c..c0db3f51 100644
--- a/lib/ppmdfont.c
+++ b/lib/ppmdfont.c
@@ -1,5 +1,7 @@
 #include <stdio.h>
 #include <assert.h>
+#include <errno.h>
+#include <string.h>
 
 #include "pm.h"
 #include "mallocvar.h"
@@ -62,7 +64,15 @@ static void
 readFontHeader(FILE *                   const ifP,
                struct ppmd_fontHeader * const fontHeaderP) {
     
-    fread(&fontHeaderP->signature, 1, sizeof(fontHeaderP->signature), ifP);
+    size_t rc;
+
+    rc = fread(&fontHeaderP->signature, 1, sizeof(fontHeaderP->signature),
+               ifP);
+
+    if (rc != sizeof(fontHeaderP->signature))
+        pm_error("Unable to read the header from the font file.  "
+                 "errno=%d (%s)", errno, strerror(errno));
+
     fontHeaderP->format         = fgetc(ifP);
     fontHeaderP->characterCount = fgetc(ifP);
     fontHeaderP->firstCodePoint = fgetc(ifP);