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=519fe9d61f768cb5235921071f293d729413ebc5'>refs</a><a class='active' href='/guix/log/gnu/packages/moe.scm'>log</a><a href='/guix/tree/gnu/packages/moe.scm?id=519fe9d61f768cb5235921071f293d729413ebc5'>tree</a><a href='/guix/commit/gnu/packages/moe.scm?id=519fe9d61f768cb5235921071f293d729413ebc5'>commit</a><a href='/guix/diff/gnu/packages/moe.scm?id=519fe9d61f768cb5235921071f293d729413ebc5'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/moe.scm'>
<input type='hidden' name='id' value='519fe9d61f768cb5235921071f293d729413ebc5'/><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=519fe9d61f768cb5235921071f293d729413ebc5'>root</a>/<a href='/guix/log/gnu?id=519fe9d61f768cb5235921071f293d729413ebc5'>gnu</a>/<a href='/guix/log/gnu/packages?id=519fe9d61f768cb5235921071f293d729413ebc5'>packages</a>/<a href='/guix/log/gnu/packages/moe.scm?id=519fe9d61f768cb5235921071f293d729413ebc5'>moe.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/moe.scm?id=519fe9d61f768cb5235921071f293d729413ebc5&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>