diff options
| author | Hao Wu <hao.a.wu@intel.com> | 2015-07-13 01:22:44 +0000 |
|---|---|---|
| committer | hwu1225 <hwu1225@Edk2> | 2015-07-13 01:22:44 +0000 |
| commit | 83daa931dc58e708ac446271a2883d6b73bd77ae (patch) | |
| tree | 35e21fcec342261b8ae2cf73f2ddce354c074e39 /IntelFrameworkModulePkg/Universal | |
| parent | 885c3060c193c9f4c3e3430c82c8c3e8fc574398 (diff) | |
| download | edk2-platforms-83daa931dc58e708ac446271a2883d6b73bd77ae.tar.xz | |
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 <hao.a.wu@intel.com>
Reviewed-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17930 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'IntelFrameworkModulePkg/Universal')
| -rw-r--r-- | IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c | 14 |
1 files 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);
}
|