diff --git a/lib/t1lib/parseAFM.c b/lib/t1lib/parseAFM.c
index 6a31d7f..ba64541 100644
--- a/lib/t1lib/parseAFM.c
+++ b/lib/t1lib/parseAFM.c
@@ -199,7 +199,9 @@ static char *token(stream)
     idx = 0;
     
     while (ch != EOF && ch != ' ' && ch != CR  && ch != LF &&
-	   ch != CTRL_Z && ch != '\t' && ch != ':' && ch != ';'){
+	   ch != CTRL_Z && ch != '\t' && ch != ':' && ch != ';'
+     && idx < (MAX_NAME -1))
+    {
       ident[idx++] = ch;
       ch = fgetc(stream);
     } /* while */
@@ -235,7 +237,7 @@ static char *linetoken(stream)
     while ((ch = fgetc(stream)) == ' ' || ch == '\t' ); 
     
     idx = 0;
-    while (ch != EOF && ch != CR  && ch != LF && ch != CTRL_Z) 
+    while (ch != EOF && ch != CR  && ch != LF && ch != CTRL_Z && idx < (MAX_NAME - 1)) 
     {
         ident[idx++] = ch;
         ch = fgetc(stream);

</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=89da127035737bdf922bc566970c5506c2e01b00'>refs</a><a class='active' href='/guix/log/gnu/packages/lout.scm'>log</a><a href='/guix/tree/gnu/packages/lout.scm?id=89da127035737bdf922bc566970c5506c2e01b00'>tree</a><a href='/guix/commit/gnu/packages/lout.scm?id=89da127035737bdf922bc566970c5506c2e01b00'>commit</a><a href='/guix/diff/gnu/packages/lout.scm?id=89da127035737bdf922bc566970c5506c2e01b00'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/lout.scm'>
<input type='hidden' name='id' value='89da127035737bdf922bc566970c5506c2e01b00'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=89da127035737bdf922bc566970c5506c2e01b00'>root</a>/<a href='/guix/log/gnu?id=89da127035737bdf922bc566970c5506c2e01b00'>gnu</a>/<a href='/guix/log/gnu/packages?id=89da127035737bdf922bc566970c5506c2e01b00'>packages</a>/<a href='/guix/log/gnu/packages/lout.scm?id=89da127035737bdf922bc566970c5506c2e01b00'>lout.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/lout.scm?id=89da127035737bdf922bc566970c5506c2e01b00&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-02-21 15:02:48 +0100'>2018-02-21</span></td><td><a href='/guix/commit/gnu/packages/lout.scm?id=9a9d64eaf97609d05b52deacdbd3dfb171a29048'>gnu: lout: Update phase style.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/lout.scm (lout)[arguments]: Write phases in-line, use
MODIFY-PHASES syntax, INVOKE, and WITH-DIRECTORY-EXCURSION, and end
phases with #t.  Re-indent the result.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-02-16 11:11:40 +0100'>2018-02-16</span></td><td><a href='/guix/commit/gnu/packages/lout.scm?id=340978d7b054dcde6c3334267b40a8293eb0ce85'>gnu: Use HTTPS for supported nongnu.org home pages.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/acl.scm (acl)[home-page]: Use HTTPS.
* gnu/packages/admin.scm (dmidecode)[home-page]: Likewise.
* gnu/packages/attr.scm (attr)[home-page]: Likewise.
* gnu/packages/audio.scm (lash)[home-page]: Likewise.
* gnu/packages/avr.scm (avr-libc)[home-page]: Likewise.
* gnu/packages/backup.scm (rdiff-backup, libchop)[home-page]: Likewise.
* gnu/packages/compression.scm (fastjar, lzip, lziprecover, atool)
(lunzip, clzip, lzlib, plzip)[home-page]: Likewise.
* gnu/packages/emacs.scm (geiser, bbdb, m17n-lib, m17n-lib)[home-page]:
Likewise.
* gnu/packages/flashing-tools.scm (avrdude)[home-page]: Likewise.
* gnu/packages/fontutils.scm (libotf)[home-page]: Likewise.
* gnu/packages/game-development.scm (gzochi)[home-page]: Likewise.
* gnu/packages/games.scm (enigma)[home-page]: Likewise.
* gnu/packages/gsasl.scm (libntlm)[home-page]: Likewise.
* gnu/packages/gtk.scm (guile-cairo)[home-page]: Likewise.
* gnu/packages/guile.scm (guile-reader, guile-lib, guile-json)
(guile-redis, g-wrap)[home-page]: Likewise.
* gnu/packages/libunwind.scm (libunwind)[home-page]: Likewise.
* gnu/packages/lout.scm (lout)[home-page]: Likewise.
* gnu/packages/mpd.scm (sonata)[home-page]: Likewise.
* gnu/packages/networking.scm (quagga)[home-page]: Likewise.
* gnu/packages/ratpoison.scm (ratpoison)[home-page]: Likewise.
* gnu/packages/skribilo.scm (skribilo)[home-page]: Likewise.
* gnu/packages/telephony.scm (exosip)[home-page]: Likewise.
* gnu/packages/texinfo.scm (texi2html)[home-page]: Likewise.
* gnu/packages/xdisorg.scm (xbindkeys)[home-page]: Likewise.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>