From b24306f15daa2ff8510b06702114724b33895d3c Mon Sep 17 00:00:00 2001 From: Heng Luo Date: Wed, 26 Jan 2022 13:12:21 +0800 Subject: NetworkPkg: Fix incorrect unicode string of the AKM/Cipher Suite REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3813 The size of buffer should be 3 CHAR16 for Null-terminated Unicode string. The first char is the AKM/Cipher Suite number, the second char is ' ', the third char is '\0'. Cc: Maciej Rabeda Cc: Fu Siyuan Cc: Wu Jiaxin Signed-off-by: Heng Luo Reviewed-by: Maciej Rabeda --- .../WifiConnectionMgrHiiConfigAccess.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfigAccess.c b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfigAccess.c index b49825b..7cb2bfc 100644 --- a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfigAccess.c +++ b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfigAccess.c @@ -280,12 +280,16 @@ WifiMgrGetStrAKMList ( // // Current AKM Suite is between 1-9 // - AKMListDisplay = (CHAR16 *)AllocateZeroPool (sizeof (CHAR16) * AKMSuiteCount * 2); + AKMListDisplay = (CHAR16 *)AllocateZeroPool (sizeof (CHAR16) * (AKMSuiteCount * 2 + 1)); if (AKMListDisplay != NULL) { for (Index = 0; Index < AKMSuiteCount; Index++) { + // + // The size of buffer should be 3 CHAR16 for Null-terminated Unicode string. + // The first char is the AKM Suite number, the second char is ' ', the third char is '\0'. + // UnicodeSPrint ( AKMListDisplay + (Index * 2), - sizeof (CHAR16) * 2, + sizeof (CHAR16) * 3, L"%d ", Profile->Network.AKMSuite->AKMSuiteList[Index].SuiteType ); @@ -333,12 +337,16 @@ WifiMgrGetStrCipherList ( // // Current Cipher Suite is between 1-9 // - CipherListDisplay = (CHAR16 *)AllocateZeroPool (sizeof (CHAR16) * CipherSuiteCount * 2); + CipherListDisplay = (CHAR16 *)AllocateZeroPool (sizeof (CHAR16) * (CipherSuiteCount * 2 + 1)); if (CipherListDisplay != NULL) { for (Index = 0; Index < CipherSuiteCount; Index++) { + // + // The size of buffer should be 3 CHAR16 for Null-terminated Unicode string. + // The first char is the Cipher Suite number, the second char is ' ', the third char is '\0'. + // UnicodeSPrint ( CipherListDisplay + (Index * 2), - sizeof (CHAR16) * 2, + sizeof (CHAR16) * 3, L"%d ", Profile->Network.CipherSuite->CipherSuiteList[Index].SuiteType ); -- cgit v1.1