diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2024-04-11 21:05:07 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2024-04-11 21:05:07 +0000 |
| commit | 2ea6cbec549e46141e1212436db4dae5f1652f9b (patch) | |
| tree | 525727efa3aa54bace1e40dcdbf76a22a9a4a35a | |
| parent | 81c59f730dacf62c927eb57dcadeecffe8b8daea (diff) | |
| download | netpbm-mirror-advanced.tar.gz netpbm-mirror-advanced.tar.xz netpbm-mirror-advanced.zip | |
Release 11.06.01 advanced
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@4907 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | doc/HISTORY | 6 | ||||
| -rw-r--r-- | lib/util/mallocvar.h | 2 | ||||
| -rw-r--r-- | version.mk | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/doc/HISTORY b/doc/HISTORY index 7416a4ba..3c4f5ecd 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,12 @@ Netpbm. CHANGE HISTORY -------------- +24.04.11 BJH Release 11.06.01 + + libnetpbm: Fix double free crash when memory allocation via + REALLOCARRAY fails. Introduced in Netpbm 10.40 (September + 2007). + 24.03.30 BJH Release 11.06.00 pamcut: add -reportonly. 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 8ee96d13..b9b6fca7 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 11 NETPBM_MINOR_RELEASE = 6 -NETPBM_POINT_RELEASE = 0 +NETPBM_POINT_RELEASE = 1 |