ShellPkg/UefiHandleParsingLib: Fix error allocate pool

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1965

For function InsertNewGuidNameMapping, it rellocate the
mGuidList with new size
"mGuidListCount+1 * sizeof(GUID_INFO_BLOCK)". That isn't
its purpose and would cause a overflow operation in
"mGuidList[mGuidListCount - 1].xxx = xxx". Its purpose
is to increase 1 block size of mGuidList. Change it to
"(mGuidListCount + 1) * sizeof (GUID_INFO_BLOCK)".

Adjust the coding style of this function.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Andrew Fish <afish@apple.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>

1 files changed, 8 insertions, 4 deletions

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index f62d30ef67..500a95a89a 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -2462,17 +2462,21 @@ InsertNewGuidNameMapping(
   IN CONST DUMP_PROTOCOL_INFO DumpFunc OPTIONAL

   )

 {

-  ASSERT(Guid   != NULL);

-  ASSERT(NameID != 0);

+  ASSERT (Guid   != NULL);

+  ASSERT (NameID != 0);

 

-  mGuidList = ReallocatePool(mGuidListCount * sizeof(GUID_INFO_BLOCK), mGuidListCount+1 * sizeof(GUID_INFO_BLOCK), mGuidList);

+  mGuidList = ReallocatePool (

+                mGuidListCount * sizeof (GUID_INFO_BLOCK),

+                (mGuidListCount + 1) * sizeof (GUID_INFO_BLOCK),

+                mGuidList

+                );

   if (mGuidList == NULL) {

     mGuidListCount = 0;

     return (EFI_OUT_OF_RESOURCES);

   }

   mGuidListCount++;

 

-  mGuidList[mGuidListCount - 1].GuidId   = AllocateCopyPool(sizeof(EFI_GUID), Guid);

+  mGuidList[mGuidListCount - 1].GuidId   = AllocateCopyPool (sizeof (EFI_GUID), Guid);

   mGuidList[mGuidListCount - 1].StringId = NameID;

   mGuidList[mGuidListCount - 1].DumpInfo = DumpFunc;