Index: base/applications/charmap/map.c =================================================================== --- base/applications/charmap/map.c (revision 71918) +++ base/applications/charmap/map.c (working copy) @@ -108,7 +108,7 @@ added = 0; x = y = 0; - while ((y <= YCELLS) && (x <= XCELLS)) + while ((y < YCELLS) && (x < XCELLS)) { ch = (WCHAR)infoPtr->ValidGlyphs[i];