Add assertion check for TmpString against NULL.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11509 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
index 8ee345e8a7ff642e8e460c33e9a3fdfc49be2d67..40d93c5ae007c43a6482d451257607f98f249cf6 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
@@ -1293,12 +1293,6 @@ CallDriverHealth (
                      DriverHealthInfo->MessageList->StringId, \r
                      NULL\r
                      );\r
-       //\r
-       // Assert if can not retrieve the message string\r
-       //\r
-       ASSERT (TmpString != NULL);\r
-       StrnCat (String, TmpString, StrLen (TmpString));\r
-       FreePool (TmpString);\r
     } else {\r
       //\r
       // Update the string will be displayed base on the driver's health status\r
@@ -1306,32 +1300,29 @@ CallDriverHealth (
       switch(DriverHealthInfo->HealthStatus) {\r
       case EfiDriverHealthStatusRepairRequired:\r
         TmpString = GetStringById (STRING_TOKEN (STR_REPAIR_REQUIRED));\r
-        StrCat (String, TmpString);\r
         break;\r
       case EfiDriverHealthStatusConfigurationRequired:\r
         TmpString = GetStringById (STRING_TOKEN (STR_CONFIGURATION_REQUIRED));\r
-        StrCat (String, TmpString);\r
         break;\r
       case EfiDriverHealthStatusFailed:\r
         TmpString = GetStringById (STRING_TOKEN (STR_OPERATION_FAILED));\r
-        StrCat (String, TmpString);\r
         break;\r
       case EfiDriverHealthStatusReconnectRequired:\r
         TmpString = GetStringById (STRING_TOKEN (STR_RECONNECT_REQUIRED));\r
-        StrCat (String, TmpString);\r
         break;\r
       case EfiDriverHealthStatusRebootRequired:\r
         TmpString = GetStringById (STRING_TOKEN (STR_REBOOT_REQUIRED));\r
-        StrCat (String, TmpString);\r
         break;\r
       default:\r
         TmpString = GetStringById (STRING_TOKEN (STR_DRIVER_HEALTH_HEALTHY));\r
-        StrCat (String, TmpString);\r
         break;\r
       }\r
-      FreePool (TmpString);\r
     }\r
 \r
+    ASSERT (TmpString != NULL);\r
+    StrCat (String, TmpString);\r
+    FreePool (TmpString);\r
+\r
     Token = HiiSetString (HiiHandle, 0, String, NULL);\r
     FreePool (String);\r
 \r