tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
niruiyu 2011-04-07 02:02:21 +00:00
parent e7cc9dcc37
commit b70a580bad
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
View File

@ -1293,12 +1293,6 @@ CallDriverHealth (
DriverHealthInfo->MessageList->StringId, DriverHealthInfo->MessageList->StringId,
NULL NULL
); );
//
// Assert if can not retrieve the message string
//
ASSERT (TmpString != NULL);
StrnCat (String, TmpString, StrLen (TmpString));
FreePool (TmpString);
} else { } else {
// //
// Update the string will be displayed base on the driver's health status // Update the string will be displayed base on the driver's health status
@ -1306,32 +1300,29 @@ CallDriverHealth (
switch(DriverHealthInfo->HealthStatus) { switch(DriverHealthInfo->HealthStatus) {
case EfiDriverHealthStatusRepairRequired: case EfiDriverHealthStatusRepairRequired:
TmpString = GetStringById (STRING_TOKEN (STR_REPAIR_REQUIRED)); TmpString = GetStringById (STRING_TOKEN (STR_REPAIR_REQUIRED));
StrCat (String, TmpString);
break; break;
case EfiDriverHealthStatusConfigurationRequired: case EfiDriverHealthStatusConfigurationRequired:
TmpString = GetStringById (STRING_TOKEN (STR_CONFIGURATION_REQUIRED)); TmpString = GetStringById (STRING_TOKEN (STR_CONFIGURATION_REQUIRED));
StrCat (String, TmpString);
break; break;
case EfiDriverHealthStatusFailed: case EfiDriverHealthStatusFailed:
TmpString = GetStringById (STRING_TOKEN (STR_OPERATION_FAILED)); TmpString = GetStringById (STRING_TOKEN (STR_OPERATION_FAILED));
StrCat (String, TmpString);
break; break;
case EfiDriverHealthStatusReconnectRequired: case EfiDriverHealthStatusReconnectRequired:
TmpString = GetStringById (STRING_TOKEN (STR_RECONNECT_REQUIRED)); TmpString = GetStringById (STRING_TOKEN (STR_RECONNECT_REQUIRED));
StrCat (String, TmpString);
break; break;
case EfiDriverHealthStatusRebootRequired: case EfiDriverHealthStatusRebootRequired:
TmpString = GetStringById (STRING_TOKEN (STR_REBOOT_REQUIRED)); TmpString = GetStringById (STRING_TOKEN (STR_REBOOT_REQUIRED));
StrCat (String, TmpString);
break; break;
default: default:
TmpString = GetStringById (STRING_TOKEN (STR_DRIVER_HEALTH_HEALTHY)); TmpString = GetStringById (STRING_TOKEN (STR_DRIVER_HEALTH_HEALTHY));
StrCat (String, TmpString);
break; break;
} }
FreePool (TmpString);
} }
ASSERT (TmpString != NULL);
StrCat (String, TmpString);
FreePool (TmpString);
Token = HiiSetString (HiiHandle, 0, String, NULL); Token = HiiSetString (HiiHandle, 0, String, NULL);
FreePool (String); FreePool (String);