BaseTools/Split: Fix potential memory and resource leak

[mirror_edk2.git] / BaseTools / Source / C / Split / Split.c

diff --git a/BaseTools/Source/C/Split/Split.c b/BaseTools/Source/C/Split/Split.c
index 44a09681d36a9ebaebe9659faa3a4e66b59fb22c..7ab66be9e873a2c3cadfea197c936b8a4e914585 100644 (file)
--- a/BaseTools/Source/C/Split/Split.c
+++ b/BaseTools/Source/C/Split/Split.c
@@ -2,7 +2,7 @@
 \r
   Split a file into two pieces at the request offset.\r
 \r
-Copyright (c) 1999 - 2015, 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
@@ -34,8 +34,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 // Utility version information\r
 //\r
-#define UTILITY_MAJOR_VERSION 0\r
-#define UTILITY_MINOR_VERSION 1\r
+#define UTILITY_MAJOR_VERSION 1\r
+#define UTILITY_MINOR_VERSION 0\r
 \r
 void\r
 Version (\r
@@ -57,10 +57,7 @@ Returns:
 \r
 --*/\r
 {\r
-  printf ("%s Version %d.%d %s\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);\r
-  printf ("Copyright (c) 1999-2015 Intel Corporation. All rights reserved.\n");\r
-  printf ("\n  SplitFile creates two Binary files either in the same directory as the current working\n");\r
-  printf ("  directory or in the specified directory.\n");\r
+  printf ("%s Version %d.%d Build %s\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);\r
 }\r
 \r
 void\r
@@ -83,6 +80,9 @@ Returns:
 --*/\r
 {\r
   Version();\r
+  printf ("Copyright (c) 1999-2016 Intel Corporation. All rights reserved.\n");\r
+  printf ("\n  SplitFile creates two Binary files either in the same directory as the current working\n");\r
+  printf ("  directory or in the specified directory.\n");\r
   printf ("\nUsage: \n\\r
    Split\n\\r
      -f, --filename inputFile to split\n\\r
@@ -223,14 +223,15 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS    Status = EFI_SUCCESS;\r
+  INTN          ReturnStatus = STATUS_SUCCESS;\r
   FILE          *In;\r
   CHAR8         *InputFileName = NULL;\r
   CHAR8         *OutputDir = NULL;\r
   CHAR8         *OutFileName1 = NULL;\r
   CHAR8         *OutFileName2 = NULL;\r
   UINT64        SplitValue = (UINT64) -1;\r
-  FILE          *Out1;\r
-  FILE          *Out2;\r
+  FILE          *Out1 = NULL;\r
+  FILE          *Out2 = NULL;\r
   CHAR8         *OutName1 = NULL;\r
   CHAR8         *OutName2 = NULL;\r
   CHAR8         *CurrentDir = NULL;\r
@@ -323,7 +324,7 @@ Returns:
       if (strlen(argv[0]) > 2) {\r
         Status = CountVerboseLevel (&argv[0][2], strlen(argv[0]) - 2, &VerboseLevel);\r
         if (EFI_ERROR (Status)) {\r
-          Error (NULL, 0, 0x1003, NULL, "%s is invaild paramter!", argv[0]);\r
+          Error (NULL, 0, 0x1003, NULL, "%s is invaild parameter!", argv[0]);\r
           return STATUS_ERROR;\r
         }\r
       }\r
@@ -344,9 +345,9 @@ Returns:
       continue;\r
     }\r
     //\r
-    // Don't recognize the paramter.\r
+    // Don't recognize the parameter.\r
     //\r
-    Error (NULL, 0, 0x1003, NULL, "%s is invaild paramter!", argv[0]);\r
+    Error (NULL, 0, 0x1003, NULL, "%s is invaild parameter!", argv[0]);\r
     return STATUS_ERROR;\r
   }\r
 \r
@@ -366,7 +367,8 @@ Returns:
     OutName1 = (CHAR8*)malloc(strlen(InputFileName) + 16);\r
     if (OutName1 == NULL) {\r
       Warning (NULL, 0, 0, NULL, "Memory Allocation Fail.");\r
-      return STATUS_ERROR;\r
+      ReturnStatus = STATUS_ERROR;\r
+      goto Finish;\r
     }\r
     strcpy (OutName1, InputFileName);\r
     strcat (OutName1, "1");\r
@@ -377,7 +379,8 @@ Returns:
     OutName2 = (CHAR8*)malloc(strlen(InputFileName) + 16);\r
     if (OutName2 == NULL) {\r
       Warning (NULL, 0, 0, NULL, "Memory Allocation Fail.");\r
-      return STATUS_ERROR;\r
+      ReturnStatus = STATUS_ERROR;\r
+      goto Finish;\r
     }\r
     strcpy (OutName2, InputFileName);\r
     strcat (OutName2, "2");\r
@@ -389,20 +392,23 @@ Returns:
     //OutputDirSpecified = TRUE;\r
     if (chdir(OutputDir) != 0) {\r
       Warning (NULL, 0, 0, NULL, "Change dir to OutputDir Fail.");\r
-      return STATUS_ERROR;\r
+      ReturnStatus = STATUS_ERROR;\r
+      goto Finish;\r
     }\r
   }\r
 \r
   CurrentDir = (CHAR8*)getcwd((CHAR8*)0, 0);\r
   if (EFI_ERROR(CreateDir(&OutFileName1))) {\r
       Error (OutFileName1, 0, 5, "Create Dir for File1 Fail.", NULL);\r
-      return STATUS_ERROR;\r
+      ReturnStatus = STATUS_ERROR;\r
+      goto Finish;\r
   }\r
   chdir(CurrentDir);\r
 \r
   if (EFI_ERROR(CreateDir(&OutFileName2))) {\r
       Error (OutFileName2, 0, 5, "Create Dir for File2 Fail.", NULL);\r
-      return STATUS_ERROR;\r
+      ReturnStatus = STATUS_ERROR;\r
+      goto Finish;\r
   }\r
   chdir(CurrentDir);\r
   free(CurrentDir);\r
@@ -411,14 +417,16 @@ Returns:
   if (Out1 == NULL) {\r
     // ("Unable to open file \"%s\"\n", OutFileName1);\r
     Error (OutFileName1, 0, 1, "File open failure", NULL);\r
-    return STATUS_ERROR;\r
+    ReturnStatus = STATUS_ERROR;\r
+    goto Finish;\r
   }\r
 \r
   Out2 = fopen (LongFilePath (OutFileName2), "wb");\r
   if (Out2 == NULL) {\r
     // ("Unable to open file \"%s\"\n", OutFileName2);\r
     Error (OutFileName2, 0, 1, "File open failure", NULL);\r
-    return STATUS_ERROR;\r
+    ReturnStatus = STATUS_ERROR;\r
+    goto Finish;\r
   }\r
 \r
   for (Index = 0; Index < SplitValue; Index++) {\r
@@ -439,15 +447,22 @@ Returns:
     fputc (CharC, Out2);\r
   }\r
 \r
+Finish:\r
   if (OutName1 != NULL) {\r
     free(OutName1);\r
   }\r
   if (OutName2 != NULL) {\r
     free(OutName2);\r
   }\r
-  fclose (In);\r
-  fclose (Out1);\r
-  fclose (Out2);\r
+  if (In != NULL) {\r
+    fclose (In);\r
+  }\r
+  if (Out1 != NULL) {\r
+    fclose (Out1);\r
+  }\r
+  if (Out2 != NULL) {\r
+    fclose (Out2);\r
+  }\r
 \r
-  return STATUS_SUCCESS;\r
+  return ReturnStatus;\r
 }\r