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=d1e32822b4c70b2f0b545eabef62f75162354829'>refs</a><a class='active' href='/guix/log/gnu/packages/mpi.scm'>log</a><a href='/guix/tree/gnu/packages/mpi.scm?id=d1e32822b4c70b2f0b545eabef62f75162354829'>tree</a><a href='/guix/commit/gnu/packages/mpi.scm?id=d1e32822b4c70b2f0b545eabef62f75162354829'>commit</a><a href='/guix/diff/gnu/packages/mpi.scm?id=d1e32822b4c70b2f0b545eabef62f75162354829'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/mpi.scm'>
<input type='hidden' name='id' value='d1e32822b4c70b2f0b545eabef62f75162354829'/><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=d1e32822b4c70b2f0b545eabef62f75162354829'>root</a>/<a href='/guix/log/gnu?id=d1e32822b4c70b2f0b545eabef62f75162354829'>gnu</a>/<a href='/guix/log/gnu/packages?id=d1e32822b4c70b2f0b545eabef62f75162354829'>packages</a>/<a href='/guix/log/gnu/packages/mpi.scm?id=d1e32822b4c70b2f0b545eabef62f75162354829'>mpi.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/mpi.scm?id=d1e32822b4c70b2f0b545eabef62f75162354829&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2016-02-03 21:05:51 +0100'>2016-02-03</span></td><td><a href='/guix/commit/gnu/packages/mpi.scm?id=37d6b0978c6d74d15c6f0df3293b85341c8de562'>gnu: hwloc: Build without numactl support on armhf.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/mpi.scm (hwloc)[inputs]: Drop numactl on armhf, where the
  package is not available.
</span></span></td><td>Andreas Enge</td></tr>
<tr><td><span title='2015-11-20 11:58:40 -0600'>2015-11-20</span></td><td><a href='/guix/commit/gnu/packages/mpi.scm?id=ac356fd6abf31c7cd102b27abacc9fc6047142e7'>gnu: openmpi: Update to 1.10.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/mpi.scm (openmpi): Update to 1.10.1.
  [arguments]: Remove now-unsupported configure flags.  Add
  --enable-builtin-atomics.  Remove development-oriented
  --enable-debug.
</span></span></td><td>Eric Bavier</td></tr>
<tr><td><span title='2015-11-20 11:58:40 -0600'>2015-11-20</span></td><td><a href='/guix/commit/gnu/packages/mpi.scm?id=2f5b6a1f1815a4e2118dabdb65aa8471b11badec'>gnu: hwloc: Update to 1.11.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/mpi.scm (hwloc): Update to 1.11.1.
  [source]: Remove patch.
* gnu/packages/patches/hwloc-gather-topology-lstopo.patch: Delete it.
* gnu-system.am (dist_patch_DATA): Remove it.
</span></span></td><td>Eric Bavier</td></tr>