about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2016-04-13 01:49:55 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2016-04-13 01:49:55 +0000
commit3bb2edc4c1563f23e5e2922095eb8d6705e499d1 (patch)
treea7264dafad62c8f8d3091f8484af659e7f8ef25e
parent8dd356f39cadeca9c9b8c76787fc0aa66da1beec (diff)
downloadnetpbm-mirror-3bb2edc4c1563f23e5e2922095eb8d6705e499d1.tar.gz
netpbm-mirror-3bb2edc4c1563f23e5e2922095eb8d6705e499d1.tar.xz
netpbm-mirror-3bb2edc4c1563f23e5e2922095eb8d6705e499d1.zip
Release 10.74.02
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2705 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY6
-rw-r--r--generator/pbmtext.c2
-rw-r--r--version.mk2
3 files changed, 8 insertions, 2 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index 709b9612..e0557fd3 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,9 +4,15 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+16.04.12 BJH  Release 10.74.02
+
+              pbmtext: Fix bug: invalid memory reference when text contains
+              code points > 127.  Broken in 10.74.00
+
 16.03.31 BJH  Release 10.74.01
          
               Build: Remove use of strndup so it compiles on Mac OS X 10.6.
+              Broken in 10.74.00.
 
 16.03.27 BJH  Release 10.74.00
 
diff --git a/generator/pbmtext.c b/generator/pbmtext.c
index 221f215e..8ae28616 100644
--- a/generator/pbmtext.c
+++ b/generator/pbmtext.c
@@ -579,7 +579,7 @@ insertCharacters(bit **        const bits,
     
         for (cursor = 0; lp.textArray[line][cursor] != '\0'; ++cursor) {
             char const currentChar = lp.textArray[line][cursor];
-            unsigned int const glyphIndex = (unsigned int) currentChar;
+            unsigned int const glyphIndex = (unsigned char) currentChar;
             struct glyph * const glyphP = fontP->glyph[glyphIndex];
             int const toprow = row + fontP->maxheight + fontP->y 
                 - glyphP->height - glyphP->y;
diff --git a/version.mk b/version.mk
index 0d25bc1b..e320c1f5 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 74
-NETPBM_POINT_RELEASE = 1
+NETPBM_POINT_RELEASE = 2