diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2017-08-11 02:29:45 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2017-08-11 02:29:45 +0000 |
| commit | ed5ec3e8c54828469310d3311dee741cac51b059 (patch) | |
| tree | d26c03b9ade0f24ca8855cf6ac7317a7e3b61c13 | |
| parent | 9d864b9364601bac99be4b74d4a914c701024d99 (diff) | |
| download | netpbm-mirror-ed5ec3e8c54828469310d3311dee741cac51b059.tar.gz netpbm-mirror-ed5ec3e8c54828469310d3311dee741cac51b059.tar.xz netpbm-mirror-ed5ec3e8c54828469310d3311dee741cac51b059.zip | |
Release 10.73.14
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@3044 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/pbm/pbmtoibm23xx.c | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 5 | ||||
| -rw-r--r-- | lib/libpbmfont.c | 2 | ||||
| -rw-r--r-- | version.mk | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/converter/pbm/pbmtoibm23xx.c b/converter/pbm/pbmtoibm23xx.c index 9f530b48..183d5419 100644 --- a/converter/pbm/pbmtoibm23xx.c +++ b/converter/pbm/pbmtoibm23xx.c @@ -4,7 +4,7 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version - * 2 as published by the Free Software Foundation. + * 2 or later as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/doc/HISTORY b/doc/HISTORY index 6f16efe6..bbf0ff26 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,11 @@ Netpbm. CHANGE HISTORY -------------- +17.08.11 BJH Release 10.73.14 + + libnetpbm: font facilities: fix invalid memory reference with + certain font files. + 17.06.30 BJH Release 10.73.13 ppmcolormask: fix incorrect output when input maxval is not 255. diff --git a/lib/libpbmfont.c b/lib/libpbmfont.c index 86a713aa..7a3a236f 100644 --- a/lib/libpbmfont.c +++ b/lib/libpbmfont.c @@ -1126,7 +1126,7 @@ tokenize(char * const s, *p++ = '\0'; else { words[n++] = p; - if (n >= maxWordCt) + if (n >= maxWordCt-1) break; while (*p && !ISSPACE(*p)) ++p; diff --git a/version.mk b/version.mk index f5c26e84..bb8a30b4 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 73 -NETPBM_POINT_RELEASE = 13 +NETPBM_POINT_RELEASE = 14 |