BaseTools/GenVtf: Add/refine boundary checks for strcpy/strcat calls

[mirror_edk2.git] / BaseTools / Source / C / Common / MemoryFile.c

diff --git a/BaseTools/Source/C/Common/MemoryFile.c b/BaseTools/Source/C/Common/MemoryFile.c
index 7b1aa111d10fdae0f3248664356f38cf62ddeaad..ec27619abbb09a0b440665e3fbb593cbf598e461 100644 (file)
--- a/BaseTools/Source/C/Common/MemoryFile.c
+++ b/BaseTools/Source/C/Common/MemoryFile.c
@@ -1,7 +1,7 @@
 /** @file\r
 This contains some useful functions for accessing files.\r
 \r
-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -69,6 +69,7 @@ Returns:
 \r
   NewMemoryFile = malloc (sizeof (*NewMemoryFile));\r
   if (NewMemoryFile == NULL) {\r
+    free (InputFileImage);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
@@ -194,7 +195,7 @@ Returns:
     CharsToCopy = EndOfLine - InputFile->CurrentFilePointer;\r
   }\r
 \r
-  OutputString = malloc (CharsToCopy);\r
+  OutputString = malloc (CharsToCopy + 1);\r
   if (OutputString == NULL) {\r
     return NULL;\r
   }\r
@@ -221,6 +222,9 @@ Returns:
   // Increment the current file pointer (include the 0x0A)\r
   //\r
   InputFile->CurrentFilePointer += CharsToCopy + 1;\r
+  if (InputFile->CurrentFilePointer > InputFile->Eof) {\r
+    InputFile->CurrentFilePointer = InputFile->Eof;\r
+  }\r
   CheckMemoryFileState (InputMemoryFile);\r
 \r
   //\r