about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2021-09-25 20:13:09 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2021-09-25 20:13:09 +0000
commit2d31b9e0a06dde404131dbc2300502bfd2698819 (patch)
tree15701ddfec63c3237f3ff4828bfabade5e0eae3e
parent81fecd2b0abfba11fbd934b372fed659977c11c6 (diff)
downloadnetpbm-mirror-2d31b9e0a06dde404131dbc2300502bfd2698819.tar.gz
netpbm-mirror-2d31b9e0a06dde404131dbc2300502bfd2698819.tar.xz
netpbm-mirror-2d31b9e0a06dde404131dbc2300502bfd2698819.zip
Release 10.73.37
git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@4132 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/ppm/ximtoppm.c6
-rw-r--r--doc/HISTORY7
-rw-r--r--version.mk2
3 files changed, 10 insertions, 5 deletions
diff --git a/converter/ppm/ximtoppm.c b/converter/ppm/ximtoppm.c
index dc04b363..238a7a02 100644
--- a/converter/ppm/ximtoppm.c
+++ b/converter/ppm/ximtoppm.c
@@ -116,9 +116,9 @@ ReadXimHeader(FILE *     const in_fp,
 */
     header->bits_channel = atoi(a_head.bits_per_channel);
     header->alpha_flag = atoi(a_head.alpha_channel);
-    pm_asprintf(&header->author,  a_head.author);
-    pm_asprintf(&header->date,    a_head.date);
-    pm_asprintf(&header->program, a_head.program);
+    header->author = pm_strdup(a_head.author);
+    header->date = pm_strdup(a_head.date);
+    header->program = pm_strdup(a_head.program);
     /* Do double checking for bakwards compatibility */
     if (header->npics == 0)
         header->npics = 1;
diff --git a/doc/HISTORY b/doc/HISTORY
index 1933249a..ff4a346b 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,7 +4,12 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
-21.06.30 BJH  Release 20.73.36
+21.09.25 BJH  Release 10.73.37
+
+              ximtoppm: Fix bug: invalid memory references with pathological
+              image input.  Broken in Netpbm 10.73.32 (June 2020).
+
+21.06.30 BJH  Release 10.73.36
 
               pamtopng: Fix rejection of all BLACKANDWHITE_ALPHA images with
               message about wrong depth.  Always broken (pamtopng was new in
diff --git a/version.mk b/version.mk
index b7578e76..a9ce42e8 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 73
-NETPBM_POINT_RELEASE = 36
+NETPBM_POINT_RELEASE = 37