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);
ion>
</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=44d6542e4bdbcce37c90f0ad1ea56954e47da6ad'>refs</a><a class='active' href='/guix/log/gnu/bootloader/grub.scm'>log</a><a href='/guix/tree/gnu/bootloader/grub.scm?id=44d6542e4bdbcce37c90f0ad1ea56954e47da6ad'>tree</a><a href='/guix/commit/gnu/bootloader/grub.scm?id=44d6542e4bdbcce37c90f0ad1ea56954e47da6ad'>commit</a><a href='/guix/diff/gnu/bootloader/grub.scm?id=44d6542e4bdbcce37c90f0ad1ea56954e47da6ad'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/bootloader/grub.scm'>
<input type='hidden' name='id' value='44d6542e4bdbcce37c90f0ad1ea56954e47da6ad'/><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=44d6542e4bdbcce37c90f0ad1ea56954e47da6ad'>root</a>/<a href='/guix/log/gnu?id=44d6542e4bdbcce37c90f0ad1ea56954e47da6ad'>gnu</a>/<a href='/guix/log/gnu/bootloader?id=44d6542e4bdbcce37c90f0ad1ea56954e47da6ad'>bootloader</a>/<a href='/guix/log/gnu/bootloader/grub.scm?id=44d6542e4bdbcce37c90f0ad1ea56954e47da6ad'>grub.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/gnu/bootloader/grub.scm?id=44d6542e4bdbcce37c90f0ad1ea56954e47da6ad&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-01-14 23:00:03 +0100'>2024-01-14</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=086850e5b2b4a1744565fe83624d256524b64a49'>bootloader: grub: Add support for loading an additional initrd.</a><span class='msg-avail'>...</span></td><td>Tomas Volf</td></tr>
<tr><td><span title='2023-07-13 18:59:13 +0200'>2023-07-13</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=c22c29b0c4821ebe2c66a6c76562a41d33ff8392'>bootloader: grub: Use rumpdisk-style root when booting with "noide".</a><span class='msg-avail'>...</span></td><td>Janneke Nieuwenhuizen</td></tr>
<tr><td><span title='2022-12-07 23:19:56 -0500'>2022-12-07</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=f76ed96f934fc83bb0f974396941c6a90a90e9fc'>bootloaders: grub: Fix comment.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2022-12-01 14:31:28 -0500'>2022-12-01</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=a9acbf919a7668e26863d2d26d48c5fd41b57fcd'>gnu: bootloader: Rework chaining, add grub-efi-netboot-removable-bootloader.</a><span class='msg-avail'>...</span></td><td>Stefan</td></tr>
<tr><td><span title='2022-09-08 22:30:09 +0200'>2022-09-08</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=1fc20e4c86697e9d112b9fed8079334c818dd78e'>gnu: bootloader: grub: Add support for chain-loader.</a><span class='msg-avail'>...</span></td><td>tiantian</td></tr>
<tr><td><span title='2022-06-24 10:21:06 +0200'>2022-06-24</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=62c86c8391ceb8953ca972498fd75ea9298b85ff'>image: Add support for 32bit UEFI.</a><span class='msg-avail'>...</span></td><td>Denis 'GNUtoo' Carikli</td></tr>
<tr><td><span title='2022-06-06 22:43:30 +0200'>2022-06-06</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=618f665a5ffc6330bc99c4ac2b1077c1e1a7506c'>bootloader: grub: Add removable grub-efi bootloader option.</a><span class='msg-avail'>...</span></td><td>Karl Hallsby</td></tr>
<tr><td><span title='2022-01-13 11:11:02 +0100'>2022-01-13</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=ea71ec1630e06503c14c6e7f4570b69de4e42123'>bootloader: grub: Fix serial mode.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2021-12-01 17:51:37 +0100'>2021-12-01</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=adce91a3ec0cb2912daa6eefe9324c15ff3126f7'>gnu: system: Add LUKS2 support for the root file system.</a><span class='msg-avail'>...</span></td><td>Josselin Poiret</td></tr>
<tr><td><span title='2021-08-29 01:05:26 -0400'>2021-08-29</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=da4e40948326387d5bcda58783914d5f9ce8b095'>Migrate to the new 'targets' field of bootloader-configuration.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-04-10 14:11:33 +0200'>2021-04-10</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=816a5ecdc8286f3c26abfb1f1e7cab04b6b21803'>bootloader: grub: Fix typo in docstring.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>