diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2009-02-26 21:38:35 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2009-02-26 21:38:35 +0000 |
commit | e4f137017d17bc98ef50d9f7ada38a4d65bcfdff (patch) | |
tree | 385b4851f846c02660b5a4cba06d322992fd9a47 | |
parent | 8afd119de891966422854e7ffb3851accdd4faea (diff) | |
download | netpbm-mirror-e4f137017d17bc98ef50d9f7ada38a4d65bcfdff.tar.gz netpbm-mirror-e4f137017d17bc98ef50d9f7ada38a4d65bcfdff.tar.xz netpbm-mirror-e4f137017d17bc98ef50d9f7ada38a4d65bcfdff.zip |
Fix array bound violation with PBM top/bottom concatenation
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@847 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r-- | doc/HISTORY | 3 | ||||
-rw-r--r-- | editor/pnmcat.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/HISTORY b/doc/HISTORY index ff9a9300..372fb1af 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -19,6 +19,9 @@ not yet BJH Release 10.46.00 pnmcut: finally make it just an alias of pamcut, which obsoleted it in 9.20. + pnmcat: fix array bound violation with PBM top/bottom + concatenation. Introduced in 10.44. + ilbmtoppm: Fix array bound violation with compressed ILBM. Introduced in 10.18. diff --git a/editor/pnmcat.c b/editor/pnmcat.c index 5ede0bbc..ea622a34 100644 --- a/editor/pnmcat.c +++ b/editor/pnmcat.c @@ -497,7 +497,7 @@ concatenateTopBottomPbm(FILE * const ofP, startRow = 0; backChange = FALSE; padleft = 0; - outrow[newcols-1] = 0x00; + outrow[pbm_packed_bytes(newcols)-1] = 0x00; } else { /* Determine amount of padding and color */ switch (justification) { |