]> git.proxmox.com Git - mirror_edk2.git/commitdiff
MdeModulePkg/PeiMain: PeiAllocatePool: output NULL if HOB creation fails
authorBret Barkelew <Bret.Barkelew@microsoft.com>
Wed, 12 Jun 2019 03:56:29 +0000 (11:56 +0800)
committerHao A Wu <hao.a.wu@intel.com>
Mon, 24 Jun 2019 02:18:04 +0000 (10:18 +0800)
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1901

The original logic is ASSERT if fail to create HOB. But
that doesn't make sense for release version. So it is required
to set the Buffer to null to indicate the failure.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Michael Turner <Michael.Turner@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Acked-by: Hao A Wu <hao.a.wu@intel.com>
MdeModulePkg/Core/Pei/Memory/MemoryServices.c

index 42f79ab07633a591f5ea0a2f3d64e134e2640a27..706837890fde0658ca601d347f136b6bcd3b9f72 100644 (file)
@@ -802,7 +802,12 @@ PeiAllocatePool (
              (VOID **)&Hob\r
              );\r
   ASSERT_EFI_ERROR (Status);\r
-  *Buffer = Hob+1;\r
+\r
+  if (EFI_ERROR (Status)) {\r
+    *Buffer = NULL;\r
+  } else {\r
+    *Buffer = Hob + 1;\r
+  }\r
 \r
   return Status;\r
 }\r