about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--converter/pbm/xbmtopbm.c5
-rw-r--r--doc/HISTORY3
2 files changed, 6 insertions, 2 deletions
diff --git a/converter/pbm/xbmtopbm.c b/converter/pbm/xbmtopbm.c
index 2ac61ccf..0cbebc5e 100644
--- a/converter/pbm/xbmtopbm.c
+++ b/converter/pbm/xbmtopbm.c
@@ -364,13 +364,14 @@ main(int    argc,
             bitrow[i] = bitreverse[*p++];
             
         if (cols % 8 > 0) {
-            bitrow[bytesPerRow] >>= 8 - cols % 8;
-            bitrow[bytesPerRow] <<= 8 - cols % 8;
+            bitrow[bytesPerRow-1] >>= 8 - cols % 8;
+            bitrow[bytesPerRow-1] <<= 8 - cols % 8;
         }
             
         pbm_writepbmrow_packed(stdout, bitrow, cols, 0);
     }
 
+    pbm_freerow(bitrow);
     free(data);
     pm_close(stdout);
 
diff --git a/doc/HISTORY b/doc/HISTORY
index fb744321..6392cf44 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -11,6 +11,9 @@ not yet  BJH  Release 10.61.00
               metadata, small images do require loss of quality in order to
               get down to a compression ratio of 1.
 
+              Xbmtopbm: fix incorrect output, memory leak.  Thanks Prophet of
+              the Way <afu@wta.att.ne.jp>.
+
               Sunicontopnm: Fix incorrect output for depth 8.  Always broken
               (depth = 8 capability was added in Netpbm 10.53 (December 2010).