about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2012-07-08 22:33:12 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2012-07-08 22:33:12 +0000
commit912ac54dc9e9ac6f5755d210b857a754d389c487 (patch)
tree3b5a27a5672c0cf3c3a3f0bb07e54ca7bd29ba3e
parent3ceca033fdb10c4a975d58ef21b23b05e8475a56 (diff)
downloadnetpbm-mirror-912ac54dc9e9ac6f5755d210b857a754d389c487.tar.gz
netpbm-mirror-912ac54dc9e9ac6f5755d210b857a754d389c487.tar.xz
netpbm-mirror-912ac54dc9e9ac6f5755d210b857a754d389c487.zip
Fix use of uninitialized comment_p member of struct pam
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1716 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/ppm/ppmtospu.c2
-rw-r--r--doc/HISTORY3
2 files changed, 4 insertions, 1 deletions
diff --git a/converter/ppm/ppmtospu.c b/converter/ppm/ppmtospu.c
index 8821afb1..b558c1fe 100644
--- a/converter/ppm/ppmtospu.c
+++ b/converter/ppm/ppmtospu.c
@@ -555,7 +555,7 @@ main (int argc, const char ** argv) {
 
     ifP = pm_openr(cmdline.inputFileName);
 
-    tuples = pnm_readpam(ifP, &pam, sizeof(pam));
+    tuples = pnm_readpam(ifP, &pam, PAM_STRUCT_SIZE(tuple_type));
 
     if (pam.depth < 3)
         pm_error("Image must be RGB, so at least 3 deep.  This image is "
diff --git a/doc/HISTORY b/doc/HISTORY
index 62eef7d3..57fca970 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -6,6 +6,9 @@ CHANGE HISTORY
 
 not yet  BJH  Release 10.60.00
 
+              ppmtospu: wild memory accesses.  Always broken (program added in
+              10.58 (March 2012).
+
               pamtosrf: fix storage corruption.  Always broken (program added
               in 10.55 (June 2011).