Update code to ensure the pointer ‘CurrentName’ in function ‘PerformSingleMappingDisplay’ isn’t null before being processed.

Signed-off-by: Shumin Qiu <shumin.qiu@intel.com>
Reviewed-by: Jaben Carsey <Jaben.carsey@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14990 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Shumin Qiu 2013-12-17 01:04:38 +00:00 committed by shenshushi
parent 6f05676ddd
commit c6cef63532
1 changed files with 7 additions and 0 deletions

View File

@ -468,6 +468,9 @@ PerformSingleMappingDisplay(
}
} else {
Alias = StrnCatGrow(&Alias, 0, MapList, 0);
if (Alias == NULL) {
return EFI_OUT_OF_RESOURCES;
}
TempSpot = StrStr(Alias, CurrentName);
if (TempSpot != NULL) {
TempSpot2 = StrStr(TempSpot, L";");
@ -484,6 +487,10 @@ PerformSingleMappingDisplay(
}
} else {
CurrentName = NULL;
CurrentName = StrnCatGrow(&CurrentName, 0, L"", 0);
if (CurrentName == NULL) {
return (EFI_OUT_OF_RESOURCES);
}
}
DevPathString = ConvertDevicePathToText(DevPath, TRUE, FALSE);
if (!SFO) {