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);
='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=b7e2c6b1c8c1e3225064fd2c59f07f1a0154c043'>refs</a><a class='active' href='/guix/log/doc/images'>log</a><a href='/guix/tree/doc/images?id=b7e2c6b1c8c1e3225064fd2c59f07f1a0154c043'>tree</a><a href='/guix/commit/doc/images?id=b7e2c6b1c8c1e3225064fd2c59f07f1a0154c043'>commit</a><a href='/guix/diff/doc/images?id=b7e2c6b1c8c1e3225064fd2c59f07f1a0154c043'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/doc/images'>
<input type='hidden' name='id' value='b7e2c6b1c8c1e3225064fd2c59f07f1a0154c043'/><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=b7e2c6b1c8c1e3225064fd2c59f07f1a0154c043'>root</a>/<a href='/guix/log/doc?id=b7e2c6b1c8c1e3225064fd2c59f07f1a0154c043'>doc</a>/<a href='/guix/log/doc/images?id=b7e2c6b1c8c1e3225064fd2c59f07f1a0154c043'>images</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/doc/images?id=b7e2c6b1c8c1e3225064fd2c59f07f1a0154c043&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-05-12 19:27:59 +0200'>2022-05-12</span></td><td><a href='/guix/commit/doc/images?id=eeba993f570483345acd59c2d8709fd5d7ee7ae7'>doc: Add the "Full-source Bootstrap".</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/guix.texi (Reduced Binary Seed Bootstrap): Update and rename to...
(Full-Source Bootstrap): ...this.
* doc/images/gcc-core-mesboot0-graph.dot: Regenerate.
</span></span></td><td>Jan (janneke) Nieuwenhuizen</td></tr>
<tr><td><span title='2020-05-22 16:11:52 +0200'>2020-05-22</span></td><td><a href='/guix/commit/doc/images?id=cd5d5f53228fd5bf96d9f790aa2606ae71fa68d7'>doc: Update 'Bootstrapping' for further binary seed reduction.</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/images/gcc-core-mesboot0-graph.dot: New image, replacing
* doc/images/gcc-mesboot0-bag-graph.dot: ... remove file.
* doc/local.mk (DOT_FILES): Update for new image file.
* doc/guix.texi (Reduced Binary Seed Bootstrap): Use it in updated description
of further reduction of the trusted computing base.
</span></span></td><td>Jan Nieuwenhuizen</td></tr>
<tr><td><span title='2019-03-14 16:30:19 +0100'>2019-03-14</span></td><td><a href='/guix/commit/doc/images?id=19008a22d18e772062952034c58a15ed341df3b5'>Merge branch 'staging' into core-updates</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-03-13 23:12:43 +0100'>2019-03-13</span></td><td><a href='/guix/commit/doc/images?id=e1c15e8b8e25e14c253ff1212e289565736f6ea7'>doc: Document the graphical installer some more.</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/guix.texi (Preparing for Installation): Rewrite to specify the two
installation modes.
(Guided Graphical Installation): New node.
(Manual Installation): New node, with the former sections.
(After System Installation): New node.
* doc/images/installer-network.png, doc/images/installer-partitions.png,
doc/images/installer-resume.png: New files.
* doc/local.mk (dist_infoimage_DATA): Add them.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-12-16 22:49:10 +0100'>2018-12-16</span></td><td><a href='/guix/commit/doc/images?id=b3bf38a5600d0fdcb0aeed29ee121edef632165d'>doc: Update mesboot graph without bootstrap-guile.</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/images/gcc-mesboot-bag-graph.dot: Update.
</span></span></td><td>Jan Nieuwenhuizen</td></tr>
<tr><td><span title='2018-11-24 08:18:31 +0100'>2018-11-24</span></td><td><a href='/guix/commit/doc/images?id=3d3daf7fa1794c64914ed53e51838a41d9b7adc4'>doc: Update for bootstrap-mescc-tools change.</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/guix.texi (Reduced Binary Seed Bootstrap): Update for
bootstrap-mescc-tools change.
* doc/images/gcc-mesboot-bag-graph.dot: Regenerate.
</span></span></td><td>Jan Nieuwenhuizen</td></tr>
<tr><td><span title='2018-09-23 09:46:26 +0200'>2018-09-23</span></td><td><a href='/guix/commit/doc/images?id=a243722c5b8d50b4f0e3f9717ca71aa43dfc56a3'>doc: Describe the Reduced Binary Seed bootstrap.</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/guix.texi (Reduced Binary Seed Bootstrap): New node.
* doc/images/gcc-mesboot-bag-graph.dot: New file.
* doc/local.mk (DOT_FILES): Add it.
</span></span></td><td>Jan Nieuwenhuizen</td></tr>