diff options
| author | Hao Wu <hao.a.wu@intel.com> | 2016-10-11 15:23:12 +0800 |
|---|---|---|
| committer | Hao Wu <hao.a.wu@intel.com> | 2016-11-08 16:37:44 +0800 |
| commit | b14f278de4c8a3a5b8aec99d70083b02d786d6c9 (patch) | |
| tree | ad56c1eb1abf9fece66f7e18d9843af1d057407d /BaseTools | |
| parent | 399caf2d14b4e933fc1f0050f29d290359ba3614 (diff) | |
| download | edk2-platforms-b14f278de4c8a3a5b8aec99d70083b02d786d6c9.tar.xz | |
BaseTools/Split: Fix potential memory and resource leak
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools')
| -rw-r--r-- | BaseTools/Source/C/Split/Split.c | 41 |
1 files changed, 28 insertions, 13 deletions
diff --git a/BaseTools/Source/C/Split/Split.c b/BaseTools/Source/C/Split/Split.c index d723ed0a94..7ab66be9e8 100644 --- a/BaseTools/Source/C/Split/Split.c +++ b/BaseTools/Source/C/Split/Split.c @@ -223,14 +223,15 @@ Returns: --*/
{
EFI_STATUS Status = EFI_SUCCESS;
+ INTN ReturnStatus = STATUS_SUCCESS;
FILE *In;
CHAR8 *InputFileName = NULL;
CHAR8 *OutputDir = NULL;
CHAR8 *OutFileName1 = NULL;
CHAR8 *OutFileName2 = NULL;
UINT64 SplitValue = (UINT64) -1;
- FILE *Out1;
- FILE *Out2;
+ FILE *Out1 = NULL;
+ FILE *Out2 = NULL;
CHAR8 *OutName1 = NULL;
CHAR8 *OutName2 = NULL;
CHAR8 *CurrentDir = NULL;
@@ -366,7 +367,8 @@ Returns: OutName1 = (CHAR8*)malloc(strlen(InputFileName) + 16);
if (OutName1 == NULL) {
Warning (NULL, 0, 0, NULL, "Memory Allocation Fail.");
- return STATUS_ERROR;
+ ReturnStatus = STATUS_ERROR;
+ goto Finish;
}
strcpy (OutName1, InputFileName);
strcat (OutName1, "1");
@@ -377,7 +379,8 @@ Returns: OutName2 = (CHAR8*)malloc(strlen(InputFileName) + 16);
if (OutName2 == NULL) {
Warning (NULL, 0, 0, NULL, "Memory Allocation Fail.");
- return STATUS_ERROR;
+ ReturnStatus = STATUS_ERROR;
+ goto Finish;
}
strcpy (OutName2, InputFileName);
strcat (OutName2, "2");
@@ -389,20 +392,23 @@ Returns: //OutputDirSpecified = TRUE;
if (chdir(OutputDir) != 0) {
Warning (NULL, 0, 0, NULL, "Change dir to OutputDir Fail.");
- return STATUS_ERROR;
+ ReturnStatus = STATUS_ERROR;
+ goto Finish;
}
}
CurrentDir = (CHAR8*)getcwd((CHAR8*)0, 0);
if (EFI_ERROR(CreateDir(&OutFileName1))) {
Error (OutFileName1, 0, 5, "Create Dir for File1 Fail.", NULL);
- return STATUS_ERROR;
+ ReturnStatus = STATUS_ERROR;
+ goto Finish;
}
chdir(CurrentDir);
if (EFI_ERROR(CreateDir(&OutFileName2))) {
Error (OutFileName2, 0, 5, "Create Dir for File2 Fail.", NULL);
- return STATUS_ERROR;
+ ReturnStatus = STATUS_ERROR;
+ goto Finish;
}
chdir(CurrentDir);
free(CurrentDir);
@@ -411,14 +417,16 @@ Returns: if (Out1 == NULL) {
// ("Unable to open file \"%s\"\n", OutFileName1);
Error (OutFileName1, 0, 1, "File open failure", NULL);
- return STATUS_ERROR;
+ ReturnStatus = STATUS_ERROR;
+ goto Finish;
}
Out2 = fopen (LongFilePath (OutFileName2), "wb");
if (Out2 == NULL) {
// ("Unable to open file \"%s\"\n", OutFileName2);
Error (OutFileName2, 0, 1, "File open failure", NULL);
- return STATUS_ERROR;
+ ReturnStatus = STATUS_ERROR;
+ goto Finish;
}
for (Index = 0; Index < SplitValue; Index++) {
@@ -439,15 +447,22 @@ Returns: fputc (CharC, Out2);
}
+Finish:
if (OutName1 != NULL) {
free(OutName1);
}
if (OutName2 != NULL) {
free(OutName2);
}
- fclose (In);
- fclose (Out1);
- fclose (Out2);
+ if (In != NULL) {
+ fclose (In);
+ }
+ if (Out1 != NULL) {
+ fclose (Out1);
+ }
+ if (Out2 != NULL) {
+ fclose (Out2);
+ }
- return STATUS_SUCCESS;
+ return ReturnStatus;
}
|