From c49999caa64dc28c155fd4602c82df32b1f27335 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Mon, 30 Aug 2021 03:52:24 +0000 Subject: Release 10.86.24 git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@4127 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- converter/ppm/ximtoppm.c | 6 +++--- doc/HISTORY | 5 +++++ version.mk | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/converter/ppm/ximtoppm.c b/converter/ppm/ximtoppm.c index 111fd5eb..92b123f6 100644 --- a/converter/ppm/ximtoppm.c +++ b/converter/ppm/ximtoppm.c @@ -117,9 +117,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 5e551964..bd80939a 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,11 @@ Netpbm. CHANGE HISTORY -------------- +21.08.30 BJH Release 10.86.24 + + ximtoppm: Fix bug: invalid memory references with pathological + image input. Broken in Netpbm 86.15 (June 2020). + 21.06.30 BJH Release 10.86.23 pamtopng: Fix -transparent option - program recognized diff --git a/version.mk b/version.mk index d349cbbf..0766bca8 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 86 -NETPBM_POINT_RELEASE = 23 +NETPBM_POINT_RELEASE = 24 -- cgit 1.4.1