EmbeddedPkg/MmcDxe: eliminate deprecated string function calls

Get rid of calls to unsafe string functions. These are deprecated and may
be removed in the future.

Note that this also fixes an existing issue in the code, where the buffer
may be overrun by one character when en == mLogRemainChar, in which case
the NUL terminator ends up after the end of the buffer.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/EmbeddedPkg/Universal/MmcDxe/Diagnostics.c b/EmbeddedPkg/Universal/MmcDxe/Diagnostics.c
index 783e548d2aed6afec644b813ffcf7485dc5d982b..7d6a5a0dde01cf890a86773d3fbafb198f5508ff 100644 (file)
--- a/EmbeddedPkg/Universal/MmcDxe/Diagnostics.c
+++ b/EmbeddedPkg/Universal/MmcDxe/Diagnostics.c
@@ -42,9 +42,9 @@ DiagnosticLog (
   )\r
 {\r
   UINTN len = StrLen (Str);\r
   )\r
 {\r
   UINTN len = StrLen (Str);\r

-  if (len <= mLogRemainChar) {\r
+  if (len < mLogRemainChar) {\r
+    StrCpyS (mLogBuffer, mLogRemainChar, Str);\r

     mLogRemainChar -= len;\r
     mLogRemainChar -= len;\r

-    StrCpy (mLogBuffer, Str);\r

     mLogBuffer += len;\r
     return len;\r
   } else {\r
     mLogBuffer += len;\r
     return len;\r
   } else {\r