about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2024-06-28 23:27:10 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2024-06-28 23:27:10 +0000
commitd746389c3036e5e18ed061e933d64ad2b1038427 (patch)
treefaaf32cf95f54ca3528b461e8c886cb1de9248f7
parent76ff9ce15f666ff5e57092f0d43d3dfea725f855 (diff)
downloadnetpbm-mirror-d746389c3036e5e18ed061e933d64ad2b1038427.tar.gz
netpbm-mirror-d746389c3036e5e18ed061e933d64ad2b1038427.tar.xz
netpbm-mirror-d746389c3036e5e18ed061e933d64ad2b1038427.zip
Release 10.86.42
git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@4921 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY8
-rw-r--r--lib/util/mallocvar.h2
-rw-r--r--version.mk2
3 files changed, 8 insertions, 4 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index ef496a32..4baa7609 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,7 +4,13 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
-not yet  BJH  Release 10.86.41
+24.06.28 BJH  Release 10.86.42
+
+              libnetpbm: Fix double free crash when memory allocation via
+              REALLOCARRAY fails.  Introduced in Netpbm 10.40 (September
+              2007).
+
+24.03.30 BJH  Release 10.86.41
 
               infotopam: fix incorrect output -- columns always in wrong
               place.  Always broken.  (infotopam was new in Netpbm 10.22 (May
diff --git a/lib/util/mallocvar.h b/lib/util/mallocvar.h
index 00ba6484..179dc638 100644
--- a/lib/util/mallocvar.h
+++ b/lib/util/mallocvar.h
@@ -87,8 +87,6 @@ reallocProduct(void **      const blockP,
     void * array; \
     array = arrayName; \
     reallocProduct(&array, nElements, sizeof(arrayName[0])); \
-    if (!array && arrayName) \
-        free(arrayName); \
     arrayName = array; \
 } while (0)
 
diff --git a/version.mk b/version.mk
index d2fd021b..0d42aef6 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 86
-NETPBM_POINT_RELEASE = 41
+NETPBM_POINT_RELEASE = 42