diff --git a/reactos/base/applications/charmap/lrgcell.c b/reactos/base/applications/charmap/lrgcell.c
index b5fef4dbb11..23b253aae70 100644
--- a/reactos/base/applications/charmap/lrgcell.c
+++ b/reactos/base/applications/charmap/lrgcell.c
@@ -48,8 +48,9 @@ SetLrgFont(PMAP infoPtr)
                       hdc);
 
             lf.lfCharSet =  DEFAULT_CHARSET;
-            wcscpy(lf.lfFaceName,
-                   lpFontName);
+            wcscpy_s(lf.lfFaceName,
+                     sizeof(lf.lfFaceName) / sizeof(lf.lfFaceName[0]),
+                     lpFontName);
 
             hFont = CreateFontIndirectW(&lf);
 
diff --git a/reactos/base/applications/charmap/map.c b/reactos/base/applications/charmap/map.c
index 0029656cd1f..43aefcfe783 100644
--- a/reactos/base/applications/charmap/map.c
+++ b/reactos/base/applications/charmap/map.c
@@ -228,8 +228,9 @@ SetFont(PMAP infoPtr,
     ReleaseDC(infoPtr->hMapWnd, hdc);
 
     infoPtr->CurrentFont.lfCharSet =  DEFAULT_CHARSET;
-    wcscpy(infoPtr->CurrentFont.lfFaceName,
-           lpFontName);
+    wcscpy_s(infoPtr->CurrentFont.lfFaceName,
+             sizeof(infoPtr->CurrentFont.lfFaceName) / sizeof(infoPtr->CurrentFont.lfFaceName[0]),
+             lpFontName);
 
     infoPtr->hFont = CreateFontIndirectW(&infoPtr->CurrentFont);