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);
 <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=257e0b681793fd1e09b247cdec655ab64d937702'>refs</a><a class='active' href='/guix/log/tests/grafts.scm'>log</a><a href='/guix/tree/tests/grafts.scm?id=257e0b681793fd1e09b247cdec655ab64d937702'>tree</a><a href='/guix/commit/tests/grafts.scm?id=257e0b681793fd1e09b247cdec655ab64d937702'>commit</a><a href='/guix/diff/tests/grafts.scm?id=257e0b681793fd1e09b247cdec655ab64d937702'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/grafts.scm'>
<input type='hidden' name='id' value='257e0b681793fd1e09b247cdec655ab64d937702'/><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=257e0b681793fd1e09b247cdec655ab64d937702'>root</a>/<a href='/guix/log/tests?id=257e0b681793fd1e09b247cdec655ab64d937702'>tests</a>/<a href='/guix/log/tests/grafts.scm?id=257e0b681793fd1e09b247cdec655ab64d937702'>grafts.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/tests/grafts.scm?id=257e0b681793fd1e09b247cdec655ab64d937702&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-06-27 23:33:48 +0200'>2019-06-27</span></td><td><a href='/guix/commit/tests/grafts.scm?id=5cc1075a76392666d3d733837f5c6252b1e48002'>Merge branch 'master' into core-updates</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-06-27 11:14:41 +0200'>2019-06-27</span></td><td><a href='/guix/commit/tests/grafts.scm?id=c89985d91d2b44704fbcaebd7a097dee0c0e3e4a'>derivations: Add 'derivation-input'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/derivations.scm (derivation-input): New procedure.
* tests/grafts.scm (make-derivation-input): Remove.
("graft-derivation, unused outputs not depended on"): Use
'derivation-input'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-06-14 21:57:39 +0200'>2019-06-14</span></td><td><a href='/guix/commit/tests/grafts.scm?id=1ba0b1e6ec41afd94a3c5f907b1122204dcb5d9d'>packages: Remove 'search-bootstrap-binary'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages.scm (%bootstrap-binaries-path, search-bootstrap-binary):
Remove.
* gnu/packages/bootstrap.scm (bootstrap-executable): Export.
* guix/tests.scm (bootstrap-binary-file, search-bootstrap-binary):
Export.
* tests/derivations.scm: Remove (gnu packages) import.
* tests/grafts.scm: Likewise.
* tests/guix-daemon.sh: Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-11-28 10:39:58 +0100'>2018-11-28</span></td><td><a href='/guix/commit/tests/grafts.scm?id=64fd1c01bc6f1be6ffcafc08789d5dafb9850c2e'>grafts: Record metadata as derivation properties.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/grafts.scm (graft-derivation/shallow): Pass #:properties to
'build-expression-&gt;derivation'.
* tests/grafts.scm ("graft-derivation, grafted item is a direct
dependency"): Check the value returned by 'derivation-properties'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-08-24 23:55:51 +0200'>2017-08-24</span></td><td><a href='/guix/commit/tests/grafts.scm?id=94e86a6b67c7a02f5f11358743f3b9f11997059c'>graft: Correctly replace references near the end of the scan buffer.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;http://bugs.gnu.org/28212&gt;.
Reported by Leo Famulari &lt;leo@famulari.name&gt;.

* guix/build/graft.scm (replace-store-references): When I &gt;= END, check
whether WRITTEN &gt; END and call 'get-bytevector-n!' when it is.
* tests/grafts.scm (buffer-size): New variable.
("replace-store-references, &lt;http://bugs.gnu.org/28212&gt;"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-01-25 11:04:25 +0100'>2017-01-25</span></td><td><a href='/guix/commit/tests/grafts.scm?id=482fda2729c3e76999892cb8f9a0391a7bd37119'>grafts: Do not pull derivation outputs not depended on.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;http://bugs.gnu.org/24886&gt;.

Previously, the grafting derivation of, say, brdf-explorer would pull in
qt:doc even though brdf-explorer depends only on qt:out, not qt:doc.

* guix/grafts.scm (with-cache): Use 'vhash-assoc' and 'vhash-cons'
instead of 'vhash-assq' and 'vhash-consq'.
(cumulative-grafts): Pass #:outputs to 'graft-derivation/shallow'.  Use
OUTPUTS instead of (derivation-output-names drv).
(graft-derivation): Add #:outputs parameter; pass it to
'cumulative-grafts'.
* tests/grafts.scm (make-derivation-input): New variable.
("graft-derivation, replaced derivation has multiple outputs"): Make
sure P2:zzz is not part of the outputs of P3D.
("graft-derivation with #:outputs")
("graft-derivation, unused outputs not depended on"): New tests.
</span></span></td><td>Ludovic Courtès</td></tr>