about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2024-04-11 21:07:03 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2024-04-11 21:07:03 +0000
commit960c29f05f55754b00c1ca2100cf8308e7693b34 (patch)
tree196fdc189ad0de80323ff95c4d3be2dbefcad07d
parent9f9dc3b09d30ab6620ee680029913b6048e87580 (diff)
downloadnetpbm-mirror-stable.tar.gz
netpbm-mirror-stable.tar.xz
netpbm-mirror-stable.zip
Release 11.02.09 stable
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@4908 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY6
-rw-r--r--lib/util/mallocvar.h2
-rw-r--r--version.mk2
3 files changed, 7 insertions, 3 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index 2fbc1170..9cf7dc82 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,12 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+24.04.11 BJH  Release 11.02.09
+
+              libnetpbm: Fix double free crash when memory allocation via
+              REALLOCARRAY fails.  Introduced in Netpbm 10.40 (September
+              2007).
+
 24.03.11 BJH  Release 11.02.08
 
               infotopam: fix incorrect output -- columns always in wrong
diff --git a/lib/util/mallocvar.h b/lib/util/mallocvar.h
index 23b28c40..16452702 100644
--- a/lib/util/mallocvar.h
+++ b/lib/util/mallocvar.h
@@ -109,8 +109,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 6b96522a..e92d58df 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 11
 NETPBM_MINOR_RELEASE = 2
-NETPBM_POINT_RELEASE = 8
+NETPBM_POINT_RELEASE = 9