about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2013-06-02 03:36:32 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2013-06-02 03:36:32 +0000
commit0389d7247b8c0e5b587566d6231d53be3e948e7a (patch)
tree0f0ed9b74d9dc671942128d3b11df27fcabcb414
parentfd4df4062a13889503c81c002576159ea6316234 (diff)
downloadnetpbm-mirror-0389d7247b8c0e5b587566d6231d53be3e948e7a.tar.gz
netpbm-mirror-0389d7247b8c0e5b587566d6231d53be3e948e7a.tar.xz
netpbm-mirror-0389d7247b8c0e5b587566d6231d53be3e948e7a.zip
check for inconsistencies between specified width and height and size of input
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1922 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/ppm/411toppm.c3
-rw-r--r--doc/HISTORY3
2 files changed, 6 insertions, 0 deletions
diff --git a/converter/ppm/411toppm.c b/converter/ppm/411toppm.c
index b5e3c03b..c87d05a9 100644
--- a/converter/ppm/411toppm.c
+++ b/converter/ppm/411toppm.c
@@ -215,6 +215,9 @@ main(int argc, const char **argv) {
         ppm_writeppmrow(stdout, pixrow, cmdline.width, 255, 0);
     }
 
+    if (fgetc(ifP) != EOF)
+        pm_message("Extraneous data at end of image.");
+
     pm_close(ifP);
     ppm_freerow(pixrow);
 
diff --git a/doc/HISTORY b/doc/HISTORY
index c512bab4..5dfe3541 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -15,6 +15,9 @@ not yet  BJH  Release 10.63.00
               yuvtoppm: check for inconsistencies between specified
               width and height and size of input.
 
+              411toppm: check for inconsistencies between specified
+              width and height and size of input.
+
               pnmtops: Fix bug: only first image gets converted.  Broken in
               Netpbm 10.56 (September 2011).