/** @file\r
+Utility program to create an EFI option ROM image from binary and EFI PE32 files.\r
\r
-Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials are licensed and made available \r
under the terms and conditions of the BSD License which accompanies this \r
distribution. The full text of the license may be found at\r
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
\r
-Module Name:\r
-\r
- EfiRom.c\r
- \r
-Abstract:\r
-\r
- Utility program to create an EFI option ROM image from binary and \r
- EFI PE32 files.\r
-\r
**/\r
\r
#include "EfiUtilityMsgs.h"\r
// the command line, or the first input filename with a different extension.\r
//\r
if (!mOptions.OutFileName[0]) {\r
- strcpy (mOptions.OutFileName, mOptions.FileList->FileName);\r
- //\r
- // Find the last . on the line and replace the filename extension with\r
- // the default\r
- //\r
- for (Ext = mOptions.OutFileName + strlen (mOptions.OutFileName) - 1;\r
- (Ext >= mOptions.OutFileName) && (*Ext != '.') && (*Ext != '\\');\r
- Ext--\r
- )\r
- ;\r
- //\r
- // If dot here, then insert extension here, otherwise append\r
- //\r
- if (*Ext != '.') {\r
- Ext = mOptions.OutFileName + strlen (mOptions.OutFileName);\r
- }\r
+ if (mOptions.FileList != NULL) {\r
+ strcpy (mOptions.OutFileName, mOptions.FileList->FileName);\r
+ //\r
+ // Find the last . on the line and replace the filename extension with\r
+ // the default\r
+ //\r
+ for (Ext = mOptions.OutFileName + strlen (mOptions.OutFileName) - 1;\r
+ (Ext >= mOptions.OutFileName) && (*Ext != '.') && (*Ext != '\\');\r
+ Ext--\r
+ )\r
+ ;\r
+ //\r
+ // If dot here, then insert extension here, otherwise append\r
+ //\r
+ if (*Ext != '.') {\r
+ Ext = mOptions.OutFileName + strlen (mOptions.OutFileName);\r
+ }\r
\r
- strcpy (Ext, DEFAULT_OUTPUT_EXTENSION);\r
+ strcpy (Ext, DEFAULT_OUTPUT_EXTENSION);\r
+ }\r
}\r
//\r
// Make sure we don't have the same filename for input and output files\r
for (FList = mOptions.FileList; FList != NULL; FList = FList->Next) {\r
if (stricmp (mOptions.OutFileName, FList->FileName) == 0) {\r
Status = STATUS_ERROR;\r
- Error (NULL, 0, 1002, "Invalid input paramter", "Input and output file names must be different - %s = %s.", FList->FileName, mOptions.OutFileName);\r
+ Error (NULL, 0, 1002, "Invalid input parameter", "Input and output file names must be different - %s = %s.", FList->FileName, mOptions.OutFileName);\r
goto BailOut;\r
}\r
}\r
// Check total size\r
//\r
if (TotalSize > MAX_OPTION_ROM_SIZE) {\r
- Error (NULL, 0, 2000, "Invalid paramter", "Option ROM image size exceeds limit of 0x%X bytes.", MAX_OPTION_ROM_SIZE);\r
+ Error (NULL, 0, 2000, "Invalid parameter", "Option ROM image size exceeds limit of 0x%X bytes.", MAX_OPTION_ROM_SIZE);\r
Status = STATUS_ERROR;\r
}\r
\r
BailOut:\r
if (Status == STATUS_SUCCESS) {\r
- if (FptrOut != NULL) {\r
- fclose (FptrOut);\r
- }\r
//\r
// Clean up our file list\r
//\r
}\r
}\r
\r
+ if (FptrOut != NULL) {\r
+ fclose (FptrOut);\r
+ }\r
+\r
if (mOptions.Verbose) {\r
VerboseMsg("%s tool done with return code is 0x%x.\n", UTILITY_NAME, GetUtilityStatus ());\r
}\r
UINT32 ClassCode;\r
UINT32 CodeRevision;\r
EFI_STATUS Status;\r
+ INTN ReturnStatus;\r
BOOLEAN EfiRomFlag;\r
UINT64 TempValue;\r
\r
+ ReturnStatus = 0;\r
FileFlags = 0;\r
EfiRomFlag = FALSE;\r
\r
Status = AsciiStringToUint64(Argv[1], FALSE, &TempValue);\r
if (EFI_ERROR (Status)) {\r
Error (NULL, 0, 2000, "Invalid option value", "%s = %s", Argv[0], Argv[1]);\r
- return 1;\r
+ ReturnStatus = 1;\r
+ goto Done;\r
}\r
if (TempValue >= 0x10000) {\r
Error (NULL, 0, 2000, "Invalid option value", "Vendor Id %s out of range!", Argv[1]);\r
- return 1;\r
+ ReturnStatus = 1;\r
+ goto Done;\r
}\r
Options->VendId = (UINT16) TempValue;\r
Options->VendIdValid = 1;\r
Status = AsciiStringToUint64(Argv[1], FALSE, &TempValue);\r
if (EFI_ERROR (Status)) {\r
Error (NULL, 0, 2000, "Invalid option value", "%s = %s", Argv[0], Argv[1]);\r
- return 1;\r
+ ReturnStatus = 1;\r
+ goto Done;\r
}\r
if (TempValue >= 0x10000) {\r
Error (NULL, 0, 2000, "Invalid option value", "Device Id %s out of range!", Argv[1]);\r
- return 1;\r
+ ReturnStatus = 1;\r
+ goto Done;\r
}\r
Options->DevId = (UINT16) TempValue;\r
Options->DevIdValid = 1;\r
//\r
if (Argv[1] == NULL || Argv[1][0] == '-') {\r
Error (NULL, 0, 2000, "Invalid parameter", "Missing output file name with %s option!", Argv[0]);\r
- return STATUS_ERROR;\r
+ ReturnStatus = STATUS_ERROR;\r
+ goto Done;\r
}\r
- strcpy (Options->OutFileName, Argv[1]);\r
+ if (strlen (Argv[1]) > MAX_PATH - 1) {\r
+ Error (NULL, 0, 2000, "Invalid parameter", "Output file name %s is too long!", Argv[1]);\r
+ ReturnStatus = STATUS_ERROR;\r
+ goto Done;\r
+ }\r
+ strncpy (Options->OutFileName, Argv[1], MAX_PATH - 1);\r
+ Options->OutFileName[MAX_PATH - 1] = 0;\r
\r
Argv++;\r
Argc--;\r
// Help option\r
//\r
Usage ();\r
- return STATUS_ERROR;\r
+ ReturnStatus = STATUS_ERROR;\r
+ goto Done;\r
} else if (stricmp (Argv[0], "-b") == 0) {\r
//\r
// Specify binary files with -b\r
Status = AsciiStringToUint64(Argv[1], FALSE, &DebugLevel);\r
if (EFI_ERROR (Status)) {\r
Error (NULL, 0, 2000, "Invalid option value", "%s = %s", Argv[0], Argv[1]);\r
- return 1;\r
+ ReturnStatus = 1;\r
+ goto Done;\r
}\r
if (DebugLevel > 9) {\r
Error (NULL, 0, 2000, "Invalid option value", "Debug Level range is 0-9, current input level is %d", Argv[1]);\r
- return 1;\r
+ ReturnStatus = 1;\r
+ goto Done;\r
}\r
if (DebugLevel>=5 && DebugLevel<=9) {\r
Options->Debug = TRUE;\r
Status = AsciiStringToUint64(Argv[1], FALSE, &TempValue);\r
if (EFI_ERROR (Status)) {\r
Error (NULL, 0, 2000, "Invalid option value", "%s = %s", Argv[0], Argv[1]);\r
- return 1;\r
+ ReturnStatus = 1;\r
+ goto Done;\r
}\r
ClassCode = (UINT32) TempValue;\r
if (ClassCode & 0xFF000000) {\r
Error (NULL, 0, 2000, "Invalid parameter", "Class code %s out of range!", Argv[1]);\r
- return STATUS_ERROR;\r
+ ReturnStatus = STATUS_ERROR;\r
+ goto Done;\r
}\r
if (FileList != NULL && FileList->ClassCode == 0) {\r
FileList->ClassCode = ClassCode;\r
Status = AsciiStringToUint64(Argv[1], FALSE, &TempValue);\r
if (EFI_ERROR (Status)) {\r
Error (NULL, 0, 2000, "Invalid option value", "%s = %s", Argv[0], Argv[1]);\r
- return 1;\r
+ ReturnStatus = 1;\r
+ goto Done;\r
}\r
CodeRevision = (UINT32) TempValue;\r
if (CodeRevision & 0xFFFF0000) {\r
Error (NULL, 0, 2000, "Invalid parameter", "Code revision %s out of range!", Argv[1]);\r
- return STATUS_ERROR;\r
+ ReturnStatus = STATUS_ERROR;\r
+ goto Done;\r
}\r
if (FileList != NULL && FileList->CodeRevision == 0) {\r
FileList->CodeRevision = (UINT16) CodeRevision;\r
mOptions.Pci23 = 1;\r
} else {\r
Error (NULL, 0, 2000, "Invalid parameter", "Invalid option specified: %s", Argv[0]);\r
- return STATUS_ERROR;\r
+ ReturnStatus = STATUS_ERROR;\r
+ goto Done;\r
}\r
} else {\r
//\r
//\r
if ((FileFlags & (FILE_FLAG_BINARY | FILE_FLAG_EFI)) == 0) {\r
Error (NULL, 0, 2000, "Invalid parameter", "Missing -e or -b with input file %s!", Argv[0]);\r
- return STATUS_ERROR;\r
+ ReturnStatus = STATUS_ERROR;\r
+ goto Done;\r
}\r
//\r
// Check Efi Option RomImage\r
FileList = (FILE_LIST *) malloc (sizeof (FILE_LIST));\r
if (FileList == NULL) {\r
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!", NULL);\r
- return STATUS_ERROR;\r
+ ReturnStatus = STATUS_ERROR;\r
+ goto Done;\r
}\r
\r
//\r
//\r
if (Options->FileList == NULL) {\r
Error (NULL, 0, 2000, "Invalid parameter", "Missing input file name!");\r
+ //\r
+ // No memory allocation, return directly.\r
+ //\r
return STATUS_ERROR;\r
}\r
\r
if (EfiRomFlag) {\r
if (!Options->VendIdValid) {\r
Error (NULL, 0, 2000, "Missing Vendor ID in command line", NULL);\r
- return STATUS_ERROR;\r
+ ReturnStatus = STATUS_ERROR;\r
+ goto Done;\r
}\r
\r
if (!Options->DevIdValid) {\r
Error (NULL, 0, 2000, "Missing Device ID in command line", NULL);\r
- return STATUS_ERROR;\r
+ ReturnStatus = STATUS_ERROR;\r
+ goto Done;\r
+ }\r
+ }\r
+\r
+Done:\r
+ if (ReturnStatus != 0) {\r
+ while (Options->FileList != NULL) {\r
+ FileList = Options->FileList->Next;\r
+ free (Options->FileList);\r
+ Options->FileList = FileList;\r
}\r
}\r
\r
- return 0;\r
+ return ReturnStatus;\r
}\r
\r
static\r
projects / mirror_edk2.git / blobdiff