From 7c605e807606003cfe752c195762467dfe6398bc Mon Sep 17 00:00:00 2001 From: giraffedata Date: Sun, 16 Apr 2017 20:24:44 +0000 Subject: Improve error message for purported image that ends in the middle of the magic number git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2954 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- lib/pmfileio.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'lib/pmfileio.c') diff --git a/lib/pmfileio.c b/lib/pmfileio.c index 035037ba..cfdac10d 100644 --- a/lib/pmfileio.c +++ b/lib/pmfileio.c @@ -774,11 +774,18 @@ pm_readmagicnumber(FILE * const ifP) { int ich1, ich2; ich1 = getc(ifP); + + if (ich1 == EOF) + pm_error("Error reading first byte of what is expected to be " + "a Netpbm magic number. " + "Most often, this means your input file is empty"); + ich2 = getc(ifP); - if (ich1 == EOF || ich2 == EOF) - pm_error( "Error reading magic number from Netpbm image stream. " - "Most often, this " - "means your input file is empty." ); + + if (ich2 == EOF) + pm_error("Error reading second byte of what is expected to be " + "a Netpbm magic number (the first byte was successfully " + "read as 0x%02x)", ich1); return ich1 * 256 + ich2; } -- cgit 1.4.1