about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2017-08-11 02:25:48 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2017-08-11 02:25:48 +0000
commit0177147f6c26806dab89f8878c97788d3893ab2f (patch)
treecbd58923947dce76bbb6590be0e7e106c2693d81
parente96fa292a75bb08492423541c5fcc45cf02620bc (diff)
downloadnetpbm-mirror-0177147f6c26806dab89f8878c97788d3893ab2f.tar.gz
netpbm-mirror-0177147f6c26806dab89f8878c97788d3893ab2f.tar.xz
netpbm-mirror-0177147f6c26806dab89f8878c97788d3893ab2f.zip
Release 10.79.04
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@3043 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY5
-rw-r--r--lib/libpbmfont.c2
-rw-r--r--version.mk2
3 files changed, 7 insertions, 2 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index f416aaca..3ae601f1 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+17.08.11 BJH  Release 10.79.04
+
+              libnetpbm: font facilities: fix invalid memory reference with
+              certain font files.
+
 17.08.02 BJH  Release 10.79.03
 
               pbmtoibm23xx: change license terms to GPL 2 or later.
diff --git a/lib/libpbmfont.c b/lib/libpbmfont.c
index 5193cd35..77724127 100644
--- a/lib/libpbmfont.c
+++ b/lib/libpbmfont.c
@@ -467,7 +467,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 4bdc2f9f..2dd1a5dd 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 79
-NETPBM_POINT_RELEASE = 3
+NETPBM_POINT_RELEASE = 4