mirror of https://github.com/acidanthera/audk.git
ShellPkg: Add checking for memory allocation and pointer returns from functions.
signed-off-by: jcarsey reviewed-by: lgrosenb git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12542 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
532691c8ba
commit
c8c2259156
|
@ -1040,7 +1040,7 @@ UpdateStdInStdOutStdErr(
|
|||
TempHandle = CreateFileInterfaceFile(TempHandle, FALSE);
|
||||
}
|
||||
Size = 0;
|
||||
if (((EFI_FILE_PROTOCOL*)TempHandle)->Read(TempHandle, &Size, NULL) != EFI_BUFFER_TOO_SMALL) {
|
||||
if (TempHandle != NULL || ((EFI_FILE_PROTOCOL*)TempHandle)->Read(TempHandle, &Size, NULL) != EFI_BUFFER_TOO_SMALL) {
|
||||
Status = EFI_INVALID_PARAMETER;
|
||||
} else {
|
||||
ShellParameters->StdIn = TempHandle;
|
||||
|
|
|
@ -2249,9 +2249,7 @@ EfiShellFindFiles(
|
|||
MapName = StrnCatGrow(&MapName, NULL, PatternCopy, Count);
|
||||
if (MapName == NULL) {
|
||||
Status = EFI_OUT_OF_RESOURCES;
|
||||
}
|
||||
|
||||
if (!EFI_ERROR(Status)) {
|
||||
} else {
|
||||
RootDevicePath = EfiShellGetDevicePathFromFilePath(PatternCopy);
|
||||
if (RootDevicePath == NULL) {
|
||||
Status = EFI_INVALID_PARAMETER;
|
||||
|
|
|
@ -163,8 +163,8 @@ ShellLevel2CommandsLibDestructor (
|
|||
@param[in] Path The unknown Path Value
|
||||
|
||||
@retval NULL A memory allocation failed
|
||||
@retval NULL a fully qualified path could not be discovered.
|
||||
@retval other pointer to a fuly qualified path.
|
||||
@retval NULL A fully qualified path could not be discovered.
|
||||
@retval other An allocated pointer to a fuly qualified path.
|
||||
**/
|
||||
CHAR16*
|
||||
EFIAPI
|
||||
|
@ -194,6 +194,10 @@ GetFullyQualifiedPath(
|
|||
|
||||
PathCleanUpDirectories(PathToReturn);
|
||||
|
||||
if (PathTpReturn == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
while (PathToReturn[StrLen(PathToReturn)-1] == L'*') {
|
||||
PathToReturn[StrLen(PathToReturn)-1] = CHAR_NULL;
|
||||
}
|
||||
|
|
|
@ -2867,7 +2867,8 @@ ShellPrintHiiEx(
|
|||
|
||||
@retval EFI_SUCCESS The Path represents a directory
|
||||
@retval EFI_NOT_FOUND The Path does not represent a directory
|
||||
@return other The path failed to open
|
||||
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.
|
||||
@return The path failed to open
|
||||
**/
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
|
@ -2892,6 +2893,10 @@ ShellIsDirectory(
|
|||
//
|
||||
if (gEfiShellProtocol != NULL) {
|
||||
TempLocation = StrnCatGrow(&TempLocation, NULL, DirName, 0);
|
||||
if (TempLocation == NULL) {
|
||||
ShellCloseFile(&Handle);
|
||||
return (EFI_OUT_OF_RESOURCES);
|
||||
}
|
||||
TempLocation2 = StrStr(TempLocation, L":");
|
||||
if (TempLocation2 != NULL && StrLen(StrStr(TempLocation, L":")) == 2) {
|
||||
*(TempLocation2+1) = CHAR_NULL;
|
||||
|
|
Loading…
Reference in New Issue