diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-12-03 16:41:07 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-12-03 16:41:07 +0000 |
| commit | 2b622324b146ce341c82ed384e3fff286ebfce11 (patch) | |
| tree | 4977809b80ad55cd071b08f919ccfcf02f8c44c8 | |
| parent | 4fd784516335a8a3247a36fe9e49be11f14354b1 (diff) | |
| download | netpbm-mirror-2b622324b146ce341c82ed384e3fff286ebfce11.tar.gz netpbm-mirror-2b622324b146ce341c82ed384e3fff286ebfce11.tar.xz netpbm-mirror-2b622324b146ce341c82ed384e3fff286ebfce11.zip | |
Release 10.47.47
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@2044 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | doc/HISTORY | 5 | ||||
| -rw-r--r-- | lib/util/vasprintf.c | 6 | ||||
| -rw-r--r-- | version.mk | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/doc/HISTORY b/doc/HISTORY index 6927a827..94b4d3b1 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,11 @@ Netpbm. CHANGE HISTORY -------------- +13.12.03 BJH Release 10.47.47 + + Fix wild pointer dereference when memory allocation for a string + fails. Broken since 10.36 (September 2006). + 13.09.26 BJH Release 10.47.46 Fixes for Mingw build with MSYS shell. diff --git a/lib/util/vasprintf.c b/lib/util/vasprintf.c index 6d350f88..47b4079d 100644 --- a/lib/util/vasprintf.c +++ b/lib/util/vasprintf.c @@ -18,9 +18,11 @@ vasprintfN(const char ** const resultP, char * result; #if HAVE_VASPRINTF - vasprintf(&result, format, varargs); + int rc; - if (result == NULL) + rc = vasprintf(&result, format, varargs); + + if (rc < 0) *resultP = strsol; else *resultP = result; diff --git a/version.mk b/version.mk index 62757ee7..6176226f 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 47 -NETPBM_POINT_RELEASE = 46 +NETPBM_POINT_RELEASE = 47 |