about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2006-12-01 03:38:01 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2006-12-01 03:38:01 +0000
commit8798d4db3568fe3ee52efd220a2ae5ffb01aa5d8 (patch)
treee137f4aba3972f9e27e0bf81022778c08033974d
parent97abc12b97b06f102356505f438f540fbbb3f858 (diff)
downloadnetpbm-mirror-8798d4db3568fe3ee52efd220a2ae5ffb01aa5d8.tar.gz
netpbm-mirror-8798d4db3568fe3ee52efd220a2ae5ffb01aa5d8.tar.xz
netpbm-mirror-8798d4db3568fe3ee52efd220a2ae5ffb01aa5d8.zip
fix crash when there is only one character
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@159 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY2
-rw-r--r--generator/pbmtext.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index dd72e453..a7ec07c2 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -6,6 +6,8 @@ CHANGE HISTORY
 
 not yet  BJH  Release 10.37.0
 
+              pbmtext: Fix crash when there is only one character.
+
               pnmcrop: work on multi-image stream.
               Thanks Erik Auerswald <auerswal@unix-ag.uni-kl.de>.
 
diff --git a/generator/pbmtext.c b/generator/pbmtext.c
index e1d132d0..6706598f 100644
--- a/generator/pbmtext.c
+++ b/generator/pbmtext.c
@@ -246,8 +246,8 @@ get_line_dimensions(const char line[], const struct font * const font_p,
                     *bwid_p += full_pixels;
                     accumulated_ics -= full_pixels;
                 }
-                lastGlyphP = glyphP;
             }
+            lastGlyphP = glyphP;
             *bwid_p += glyphP->xadd;
         }
     }