From 7c5533aefcce459b4df82ea12c763471f45d4169 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Sat, 25 Apr 2009 22:18:30 +0000 Subject: 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 --- lib/ppmdfont.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'lib/ppmdfont.c') 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 #include +#include +#include #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); -- cgit 1.4.1