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);
'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=c469a8b09e6cb54d0d7e76f1baac9591c9dc958b'>refs</a><a class='active' href='/guix/log/m4'>log</a><a href='/guix/tree/m4?id=c469a8b09e6cb54d0d7e76f1baac9591c9dc958b'>tree</a><a href='/guix/commit/m4?id=c469a8b09e6cb54d0d7e76f1baac9591c9dc958b'>commit</a><a href='/guix/diff/m4?id=c469a8b09e6cb54d0d7e76f1baac9591c9dc958b'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/m4'>
<input type='hidden' name='id' value='c469a8b09e6cb54d0d7e76f1baac9591c9dc958b'/><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=c469a8b09e6cb54d0d7e76f1baac9591c9dc958b'>root</a>/<a href='/guix/log/m4?id=c469a8b09e6cb54d0d7e76f1baac9591c9dc958b'>m4</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/m4?id=c469a8b09e6cb54d0d7e76f1baac9591c9dc958b&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-01-14 11:41:15 +0200'>2022-01-14</span></td><td><a href='/guix/commit/m4?id=03b45230d409c5f09e6ad18f23f313a13dbddb7d'>gnu: bootstrap: Add support for riscv64-linux.</a><span class='msg-avail'>...<span class='msg-tooltip'>On 7d93b21ab1c132990054372a9677c1639d54e631
    gnu: glibc-for-bootstrap: Update patch.

Run
    ./pre-inst-env guix build --target=riscv64-linux-gnu bootstrap-tarballs

Producing
    /gnu/store/4hdzva9i0wyyfbgj1lmqc1wkk644pv07-bootstrap-tarballs-0

With guix hash -rx
    1nj0fdgj08bbmfny01mp2blv7c3p2iciqh31zmf04ap5s7ygsqlp

* gnu/packages/bootstrap.scm (%bootstrap-executables): Add entries for
riscv64-linux.
(%bootstrap-guile-hash, %bootstrap-coreutils&amp;co, %bootstrap-binutils,
%bootstrap-glibc, %bootstrap-gcc): Add entry for riscv64-linux.
(raw-build-guile3): New procedure.
(make-raw-bag): Use raw-build-guile3 for riscv64-linux.
* guix/packages.scm (%supported-systems): Add riscv64-linux.
(%cuirass-supported-systems): Remove riscv64-linux.
* guix/utils.scm (target-64bit?): Add riscv64-linux.
* m4/guix.m4: Add riscv64-linux as a supported system.
* doc/guix.texi (GNU Distribution): Add riscv64-linux.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-12-14 18:33:49 +0200'>2021-12-14</span></td><td><a href='/guix/commit/m4?id=08d15a24c90e597f1656c3c0c3dbccf2022517de'>build: Adjust 'courage level' of different systems.</a><span class='msg-avail'>...<span class='msg-tooltip'>* m4/guix.m4 (GUIX_ASSERT_SUPPORTED_SYSTEM): Add i586-gnu. Move
powerpc-linux to unsupported but not needing courage. Add mips64el-linux
to unsupported.
</span></span></td><td>Efraim Flashner</td></tr>