{\r
EFI_STATUS Status;\r
CHAR16 *NameSuffixed;\r
+ UINTN NameLength;\r
+ UINTN SuffixLength;\r
\r
//\r
// enough to concatenate both strings.\r
//\r
- NameSuffixed = AllocateZeroPool ((StrLen (Name) + StrLen (Suffix) + 1) * sizeof (CHAR16)); \r
+ NameLength = StrLen (Name);\r
+ SuffixLength = StrLen (Suffix);\r
+ NameSuffixed = AllocateZeroPool ((NameLength + SuffixLength + 1) * sizeof (CHAR16)); \r
\r
StrCpy (NameSuffixed, Name);\r
StrCat (NameSuffixed, Suffix);\r