about summary refs log tree commit diff
path: root/editor/pnmcat.c
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2012-12-25 01:27:23 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2012-12-25 01:27:23 +0000
commit0a75e38834b1a121fd723185bdfad0d6850475a2 (patch)
tree680ecfbf1a965973c1477f02c1d6f47ce64e8d93 /editor/pnmcat.c
parent74aaada027a5ada8f448ba497fb0d15df3c00fe9 (diff)
downloadnetpbm-mirror-0a75e38834b1a121fd723185bdfad0d6850475a2.tar.gz
netpbm-mirror-0a75e38834b1a121fd723185bdfad0d6850475a2.tar.xz
netpbm-mirror-0a75e38834b1a121fd723185bdfad0d6850475a2.zip
Set don't care bits to zero
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1817 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'editor/pnmcat.c')
-rw-r--r--editor/pnmcat.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/editor/pnmcat.c b/editor/pnmcat.c
index 6d970c8f..a26dcf3e 100644
--- a/editor/pnmcat.c
+++ b/editor/pnmcat.c
@@ -93,6 +93,8 @@ parseCommandLine(int argc, const char ** const argv,
     pm_optParseOptions3(&argc, (char **)argv, opt, sizeof(opt), 0);
         /* Uses and sets argc, argv, and some of *cmdlineP and others. */
 
+    free(option_def);
+
     if (leftright + topbottom > 1)
         pm_error("You may specify only one of -topbottom (-tb) and "
                  "-leftright (-lr)");
@@ -427,6 +429,8 @@ concatenateLeftRightPbm(FILE *             const ofP,
 
     getPbmImageInfo(img, nfiles, newrows, justification, backcolor, &img2);
 
+    outrow[pbm_packed_bytes(newcols)-1] = 0x00;
+
     for (row = 0; row < newrows; ++row) {
         unsigned int i;
 
@@ -565,7 +569,7 @@ concatenateTopBottomPbm(FILE *             const ofP,
 
         backgroundPrev = background;
     }
-    free(outrow);
+    pbm_freerow_packed(outrow);
 }
 
 
@@ -860,6 +864,7 @@ main(int           argc,
     for (i = 0; i < cmdline.nfiles; ++i)
         pm_close(img[i].ifP);
     free(cmdline.inputFilespec);
+    free(img);
     pm_close(stdout);
 
     return 0;