2 files changed, 4 insertions, 0 deletions
diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
index e0f1fcea48..f7e7cdfcfb 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
@@ -2763,6 +2763,7 @@ ConvertTextToDeviceNode (
   ParamStr      = NULL;
   DumpNode      = NULL;
   DeviceNodeStr = StrDuplicate (TextDeviceNode);
+  ASSERT (DeviceNodeStr != NULL);
 
   for (Index = 0; DevPathFromTextTable[Index].Function; Index++) {
     ParamStr = GetParamByNodeName (DeviceNodeStr, DevPathFromTextTable[Index].DevicePathNodeText);
@@ -2822,6 +2823,7 @@ ConvertTextToDevicePath (
   }
 
   DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) AllocatePool (END_DEVICE_PATH_LENGTH);
+  ASSERT (DevicePath != NULL);
   SetDevicePathEndNode (DevicePath);
 
   ParamStr            = NULL;
@@ -2857,6 +2859,7 @@ ConvertTextToDevicePath (
 
     if (IsInstanceEnd != 0) {
       DeviceNode = (EFI_DEVICE_PATH_PROTOCOL *) AllocatePool (END_DEVICE_PATH_LENGTH);
+      ASSERT (DeviceNode != NULL);
       SET_DEVICE_PATH_INSTANCE_END_NODE (DeviceNode);
 
       NewDevicePath = AppendDeviceNodeProtocolInterface (DevicePath, DeviceNode);
diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
index 2e4a976adc..d45c267ffb 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
@@ -708,6 +708,7 @@ DevPathToTextUsbWWID (
     // In case no NULL terminator in SerialNumber, create a new one with NULL terminator
     //
     NewStr = AllocateCopyPool ((Length + 1) * sizeof (CHAR16), SerialNumberStr);
+    ASSERT (NewStr != NULL);
     NewStr [Length] = 0;
     SerialNumberStr = NewStr;
   }