sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellPkg: Add checking for memory allocation and pointer returns from functions.

Browse Source 
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:
jcarsey
2011-10-17 17:49:21 +00:00
parent 532691c8ba
commit c8c2259156
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1040,7 +1040,7 @@ UpdateStdInStdOutStdErr(
TempHandle = CreateFileInterfaceFile(TempHandle, FALSE); TempHandle = CreateFileInterfaceFile(TempHandle, FALSE);
} }
Size = 0; 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; Status = EFI_INVALID_PARAMETER;
} else { } else {
ShellParameters->StdIn = TempHandle; ShellParameters->StdIn = TempHandle;

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

@ -2249,9 +2249,7 @@ EfiShellFindFiles(
MapName = StrnCatGrow(&MapName, NULL, PatternCopy, Count); MapName = StrnCatGrow(&MapName, NULL, PatternCopy, Count);
if (MapName == NULL) { if (MapName == NULL) {
Status = EFI_OUT_OF_RESOURCES; Status = EFI_OUT_OF_RESOURCES;
} } else {
if (!EFI_ERROR(Status)) {
RootDevicePath = EfiShellGetDevicePathFromFilePath(PatternCopy); RootDevicePath = EfiShellGetDevicePathFromFilePath(PatternCopy);
if (RootDevicePath == NULL) { if (RootDevicePath == NULL) {
Status = EFI_INVALID_PARAMETER; Status = EFI_INVALID_PARAMETER;

8
ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
View File

@ -163,8 +163,8 @@ ShellLevel2CommandsLibDestructor (
@param[in] Path The unknown Path Value @param[in] Path The unknown Path Value
@retval NULL A memory allocation failed @retval NULL A memory allocation failed
@retval NULL a fully qualified path could not be discovered. @retval NULL A fully qualified path could not be discovered.
@retval other pointer to a fuly qualified path. @retval other An allocated pointer to a fuly qualified path.
**/ **/
CHAR16* CHAR16*
EFIAPI EFIAPI
@ -194,6 +194,10 @@ GetFullyQualifiedPath(
PathCleanUpDirectories(PathToReturn); PathCleanUpDirectories(PathToReturn);
if (PathTpReturn == NULL) {
return NULL;
}
while (PathToReturn[StrLen(PathToReturn)-1] == L'*') { while (PathToReturn[StrLen(PathToReturn)-1] == L'*') {
PathToReturn[StrLen(PathToReturn)-1] = CHAR_NULL; PathToReturn[StrLen(PathToReturn)-1] = CHAR_NULL;
} }

11
ShellPkg/Library/UefiShellLib/UefiShellLib.c
View File

@ -2865,9 +2865,10 @@ ShellPrintHiiEx(
@param[in] DirName Path to directory to test. @param[in] DirName Path to directory to test.
@retval EFI_SUCCESS The Path represents a directory @retval EFI_SUCCESS The Path represents a directory
@retval EFI_NOT_FOUND The Path does not represent 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 EFI_STATUS
EFIAPI EFIAPI
@ -2892,6 +2893,10 @@ ShellIsDirectory(
// //
if (gEfiShellProtocol != NULL) { if (gEfiShellProtocol != NULL) {
TempLocation = StrnCatGrow(&TempLocation, NULL, DirName, 0); TempLocation = StrnCatGrow(&TempLocation, NULL, DirName, 0);
if (TempLocation == NULL) {
ShellCloseFile(&Handle);
return (EFI_OUT_OF_RESOURCES);
}
TempLocation2 = StrStr(TempLocation, L":"); TempLocation2 = StrStr(TempLocation, L":");
if (TempLocation2 != NULL && StrLen(StrStr(TempLocation, L":")) == 2) { if (TempLocation2 != NULL && StrLen(StrStr(TempLocation, L":")) == 2) {
*(TempLocation2+1) = CHAR_NULL; *(TempLocation2+1) = CHAR_NULL;