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);
s</option>
</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=aa9ab09569ad9a2a5672095ea88207c6742ea2ed'>refs</a><a class='active' href='/guix/log/tests/guix-build-branch.sh'>log</a><a href='/guix/tree/tests/guix-build-branch.sh?id=aa9ab09569ad9a2a5672095ea88207c6742ea2ed'>tree</a><a href='/guix/commit/tests/guix-build-branch.sh?id=aa9ab09569ad9a2a5672095ea88207c6742ea2ed'>commit</a><a href='/guix/diff/tests/guix-build-branch.sh?id=aa9ab09569ad9a2a5672095ea88207c6742ea2ed'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/guix-build-branch.sh'>
<input type='hidden' name='id' value='aa9ab09569ad9a2a5672095ea88207c6742ea2ed'/><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=aa9ab09569ad9a2a5672095ea88207c6742ea2ed'>root</a>/<a href='/guix/log/tests?id=aa9ab09569ad9a2a5672095ea88207c6742ea2ed'>tests</a>/<a href='/guix/log/tests/guix-build-branch.sh?id=aa9ab09569ad9a2a5672095ea88207c6742ea2ed'>guix-build-branch.sh</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/tests/guix-build-branch.sh?id=aa9ab09569ad9a2a5672095ea88207c6742ea2ed&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-10-22 01:46:54 +0200'>2022-10-22</span></td><td><a href='/guix/commit/tests/guix-build-branch.sh?id=fa6566bdc02958823b342b86c7d88853542444ae'>tests: 'guix build --with-commit' output no longer refers to the tag ID.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 46f7011591601b4783b2dc2c7252c41564ca0140.

* tests/guix-build-branch.sh: Replace tag ID by commit ID.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-09-28 21:06:36 -0500'>2020-09-28</span></td><td><a href='/guix/commit/tests/guix-build-branch.sh?id=d8934360d2453a403b5433e71d09188e4ed23b57'>tests: Simplify shell exit status negation;</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh,
tests/guix-daemon.sh, tests/guix-download.sh, tests/guix-environment.sh,
tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh,
tests/guix-hash.sh, tests/guix-lint.sh, tests/guix-pack-relocatable.sh,
tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh,
tests/guix-package.sh: Use the shell '!' keyword to negate command exit status
in place of 'if ...; then false; else true; fi'
</span></span></td><td>Eric Bavier</td></tr>