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

fixes for NULL verification. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11125 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jcarsey 2010-12-06 18:10:34 +00:00
parent eca37a3101
commit c154b99708
3 changed files with 109 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ShellPkg/Application/Shell/ShellEnvVar.c
View File

@ -183,7 +183,7 @@ GetEnvironmentVariableList(
Status = SHELL_GET_ENVIRONMENT_VARIABLE_AND_ATTRIBUTES(VariableName, &VarList->Atts, &ValSize, VarList->Val); Status = SHELL_GET_ENVIRONMENT_VARIABLE_AND_ATTRIBUTES(VariableName, &VarList->Atts, &ValSize, VarList->Val);
} }
} }
if (!EFI_ERROR(Status)) { if (!EFI_ERROR(Status) && VarList != NULL) {
VarList->Key = AllocatePool(StrSize(VariableName)); VarList->Key = AllocatePool(StrSize(VariableName));
if (VarList->Key == NULL) { if (VarList->Key == NULL) {
SHELL_FREE_NON_NULL(VarList->Val); SHELL_FREE_NON_NULL(VarList->Val);

5
ShellPkg/Application/Shell/ShellProtocol.c
View File

@ -907,6 +907,7 @@ InternalOpenFileDevicePath(
if (!EFI_ERROR(Status)) { if (!EFI_ERROR(Status)) {
Handle1 = ConvertShellHandleToEfiFileProtocol(ShellHandle); Handle1 = ConvertShellHandleToEfiFileProtocol(ShellHandle);
if (Handle1 != NULL) {
// //
// chop off the begining part before the file system part... // chop off the begining part before the file system part...
// //
@ -999,6 +1000,7 @@ InternalOpenFileDevicePath(
} // for loop } // for loop
} }
} }
}
SHELL_FREE_NON_NULL(AlignedNode); SHELL_FREE_NON_NULL(AlignedNode);
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
if (Handle1 != NULL) { if (Handle1 != NULL) {
@ -2001,7 +2003,7 @@ ShellSearchHandle(
ShellInfoNode->FullName = NewFullName; ShellInfoNode->FullName = NewFullName;
} }
} }
if (Directory && !EFI_ERROR(Status)){ if (Directory && !EFI_ERROR(Status) && ShellInfoNode->FullName != NULL && ShellInfoNode->FileName != NULL){
// //
// should be a directory // should be a directory
// //
@ -2015,7 +2017,6 @@ ShellSearchHandle(
// //
// //
// //
ASSERT_EFI_ERROR(Status);
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
break; break;
} }

7
ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
View File

@ -679,6 +679,7 @@ PerformMappingDelete(
return (Status); return (Status);
} }
if (HandleBuffer != NULL) {
// //
// Get the map name(s) for each one. // Get the map name(s) for each one.
// //
@ -690,7 +691,7 @@ PerformMappingDelete(
Deleted = TRUE; Deleted = TRUE;
} }
} }
}
// //
// Look up all BlockIo in the platform // Look up all BlockIo in the platform
// //
@ -718,6 +719,7 @@ PerformMappingDelete(
return (Status); return (Status);
} }
if (HandleBuffer != NULL) {
// //
// Get the map name(s) for each one. // Get the map name(s) for each one.
// //
@ -741,7 +743,8 @@ PerformMappingDelete(
Deleted = TRUE; Deleted = TRUE;
} }
} }
FreePool(HandleBuffer); }
SHELL_FREE_NON_NULL(HandleBuffer);
if (!Deleted) { if (!Deleted) {
return (EFI_NOT_FOUND); return (EFI_NOT_FOUND);
} }