From 83daa931dc58e708ac446271a2883d6b73bd77ae Mon Sep 17 00:00:00 2001 From: Hao Wu Date: Mon, 13 Jul 2015 01:22:44 +0000 Subject: [PATCH] IntelFrameworkModulePkg BdsDxe: Fix ASSERT in BdsMemoryTest This commit will resolve the issue brought by r17735. StrCatS (StrPercent, sizeof (StrPercent) / sizeof (CHAR16), TmpStr); The above using of StrCatS will cause ASSERT if TmpStr is longer than StrPercent. Therefore, StrnCatS is used here to resolve the issue. Similar scenario is for: StrCatS (StrTotalMemory, StrTotalMemorySize / sizeof (CHAR16), TmpStr); Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu Reviewed-by: Qiu Shumin Reviewed-by: Jeff Fan git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17930 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/BdsDxe/MemoryTest.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c b/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c index eef840b882..fedb151a0c 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c @@ -324,7 +324,12 @@ BdsMemoryTest ( // // TmpStr size is 64, StrPercent is reserved to 16. // - StrCatS (StrPercent, sizeof (StrPercent) / sizeof (CHAR16), TmpStr); + StrnCatS ( + StrPercent, + sizeof (StrPercent) / sizeof (CHAR16), + TmpStr, + sizeof (StrPercent) / sizeof (CHAR16) - StrLen (StrPercent) - 1 + ); PrintXY (10, 10, NULL, NULL, StrPercent); FreePool (TmpStr); } @@ -389,7 +394,12 @@ Done: TmpStr = GetStringById (STRING_TOKEN (STR_MEM_TEST_COMPLETED)); if (TmpStr != NULL) { - StrCatS (StrTotalMemory, StrTotalMemorySize / sizeof (CHAR16), TmpStr); + StrnCatS ( + StrTotalMemory, + StrTotalMemorySize / sizeof (CHAR16), + TmpStr, + StrTotalMemorySize / sizeof (CHAR16) - StrLen (StrTotalMemory) - 1 + ); FreePool (TmpStr); } -- 2.39.2