about summary refs log tree commit diff
path: root/converter
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2008-06-11 02:37:28 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2008-06-11 02:37:28 +0000
commitad48579b703e1db92abc9f792c1907d862165232 (patch)
tree46c60915219dca6ad7ff872c6476e698bbec5b78 /converter
parent7aad0b4834452047fe4a4bc7e492c615eed92a2e (diff)
downloadnetpbm-mirror-ad48579b703e1db92abc9f792c1907d862165232.tar.gz
netpbm-mirror-ad48579b703e1db92abc9f792c1907d862165232.tar.xz
netpbm-mirror-ad48579b703e1db92abc9f792c1907d862165232.zip
Release 10.42.06
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@651 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter')
-rw-r--r--converter/other/pamtotga.c3
-rw-r--r--converter/other/pamtouil.c2
-rw-r--r--converter/other/pnmtopclxl.c1
3 files changed, 4 insertions, 2 deletions
diff --git a/converter/other/pamtotga.c b/converter/other/pamtotga.c
index 1e0808ed..6c8769ed 100644
--- a/converter/other/pamtotga.c
+++ b/converter/other/pamtotga.c
@@ -461,7 +461,8 @@ computeTgaHeader(struct pam *          const pamP,
 static void
 releaseTgaHeader(struct ImageHeader const tgaHeader) {
 
-    strfree(tgaHeader.Id);
+    if (tgaHeader.IdLength > 0)
+        strfree(tgaHeader.Id);
 }
 
 
diff --git a/converter/other/pamtouil.c b/converter/other/pamtouil.c
index 58f57eef..8a80c901 100644
--- a/converter/other/pamtouil.c
+++ b/converter/other/pamtouil.c
@@ -380,7 +380,7 @@ freeCmap(cixel_map cmap[], unsigned int const ncolors) {
         if (cmapEntry.uilname)
             freeString(cmapEntry.uilname);
         if (cmapEntry.rgbname)
-            freeString(cmapEntry.uilname);
+            freeString(cmapEntry.rgbname);
     }
 }
 
diff --git a/converter/other/pnmtopclxl.c b/converter/other/pnmtopclxl.c
index 7ba64210..0737bf15 100644
--- a/converter/other/pnmtopclxl.c
+++ b/converter/other/pnmtopclxl.c
@@ -176,6 +176,7 @@ parseCommandLine(int argc, char ** argv,
     if (argc-1 < 1) {
         MALLOCVAR(cmdlineP->sourceP);
         cmdlineP->sourceP->name = "-";
+        cmdlineP->sourceP->next = NULL;
     } else {
         int i;
         InputSource ** nextLinkP;