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);
elect> <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=a46b8bbfabc0ebf4a476fbeae4066c8c94b6a45f'>refs</a><a class='active' href='/guix/log/tests/discovery.scm'>log</a><a href='/guix/tree/tests/discovery.scm?id=a46b8bbfabc0ebf4a476fbeae4066c8c94b6a45f'>tree</a><a href='/guix/commit/tests/discovery.scm?id=a46b8bbfabc0ebf4a476fbeae4066c8c94b6a45f'>commit</a><a href='/guix/diff/tests/discovery.scm?id=a46b8bbfabc0ebf4a476fbeae4066c8c94b6a45f'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/discovery.scm'>
<input type='hidden' name='id' value='a46b8bbfabc0ebf4a476fbeae4066c8c94b6a45f'/><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=a46b8bbfabc0ebf4a476fbeae4066c8c94b6a45f'>root</a>/<a href='/guix/log/tests?id=a46b8bbfabc0ebf4a476fbeae4066c8c94b6a45f'>tests</a>/<a href='/guix/log/tests/discovery.scm?id=a46b8bbfabc0ebf4a476fbeae4066c8c94b6a45f'>discovery.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/discovery.scm?id=a46b8bbfabc0ebf4a476fbeae4066c8c94b6a45f&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-07-03 23:51:23 +0200'>2017-07-03</span></td><td><a href='/guix/commit/tests/discovery.scm?id=960c6ce96d746cf19829ad26e092ec5dad2a5c62'>discovery: Recurse into directories pointed to by a symlink.</a><span class='msg-avail'>...<span class='msg-tooltip'>Reported by Christopher Baines &lt;mail@cbaines.net&gt;
and Alex Kost &lt;alezost@gmail.com&gt;
at &lt;https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00290.html&gt;.

* guix/discovery.scm (scheme-files): When ENTRY is a symlink that
doesn't end in '.scm', call 'stat' and recurse if it points to a
directory.
* tests/discovery.scm ("scheme-modules recurses in symlinks to
directories"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-06-18 00:14:07 +0200'>2017-06-18</span></td><td><a href='/guix/commit/tests/discovery.scm?id=d46c4423f46278bd2f96770ceb0667431414349e'>discovery: 'scheme-files' returns '() for a non-accessible directory.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes a regression introduced in
d27cc3bfaafe6b5b0831e88afb1c46311d382a0b.

Reported by Ricardo Wurmus &lt;rekado@elephly.net&gt;.

* guix/discovery.scm (scheme-files): Catch 'scandir*' system errors.
Return '() and optionally raise a warning upon 'system-error'.
* tests/discovery.scm ("scheme-modules, non-existent directory"): New
test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-03 23:50:15 +0200'>2017-05-03</span></td><td><a href='/guix/commit/tests/discovery.scm?id=cd903ef7871170d3c4eced45418459d293ef48a7'>Add (guix discovery).</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/discovery.scm, tests/discovery.scm: New files.
* gnu/packages.scm (scheme-files, file-name-&gt;module-name)
(scheme-modules, all-package-modules): Remove.
(fold-packages): Rewrite in terms of 'fold-module-public-variables'.
* gnu/tests.scm: Use (guix discovery).
* Makefile.am (MODULES): Add guix/discovery.scm.
(SCM_TESTS): Add tests/discovery.scm.
</span></span></td><td>Ludovic Courtès</td></tr>