(no commit message)

diff --git a/coders/pnm.c b/coders/pnm.c
index eb2837e2bd1f4925c00e1d80e178f6db0a775dbf..2df68020a665e8e0d558dda6f6cfa958ef086df2 100644 (file)
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -198,7 +198,7 @@ static unsigned int PNMInteger(Image *image,const unsigned int base,
       return(0);
     if (c == (int) '#')
       PNMComment(image,exception);
-  } while (isdigit(c) == MagickFalse);
+  } while ((c == ' ') || (c == '\t') || (c == '\n') || (c == '\r'));
   if (base == 2)
     return((unsigned int) (c-(int) '0'));
   /*
@@ -214,6 +214,8 @@ static unsigned int PNMInteger(Image *image,const unsigned int base,
       break;
     value+=c-(int) '0';
     c=ReadBlobByte(image);
+    if (c == EOF)
+      return(0);
   } while (isdigit(c) != 0);
   return(value);
 }

diff --git a/coders/xbm.c b/coders/xbm.c
index 9400ea75948d3034090a895e8b0f2b48761be2e7..e952bfb642e430354d58b5ddd29e8a1a3765f230 100644 (file)
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -147,7 +147,7 @@ static unsigned int XBMInteger(Image *image,short int *hex_digits)
     c=ReadBlobByte(image);
     if (c == EOF)
       return(0);
-  } while (hex_digits[c] < 0);
+  } while ((c == ' ') || (c == '\t') || (c == '\n') || (c == '\r'));
   /*
     Evaluate number.
   */
@@ -162,6 +162,8 @@ static unsigned int XBMInteger(Image *image,short int *hex_digits)
       break;
     value+=hex_digits[c];
     c=ReadBlobByte(image);
+    if (c == EOF)
+      return(0);
   } while (hex_digits[c] >= 0);
   return(value);
 }