BaseTools: Unify long and int in Expression.py

[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 cace6282acfece9e3b7390fe1f0b40c05b9a839c..ec27619abbb09a0b440665e3fbb593cbf598e461 100644 (file)
--- a/BaseTools/Source/C/Common/MemoryFile.c
+++ b/BaseTools/Source/C/Common/MemoryFile.c
@@ -1,7 +1,8 @@
 /** @file\r
+This contains some useful functions for accessing files.\r
 \r
-Copyright (c) 2004 - 2008, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \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
 http://opensource.org/licenses/bsd-license.php                                            \r
@@ -9,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 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
-  MemoryFile.c\r
-\r
-Abstract:\r
-\r
-  This contains some useful functions for accessing files.\r
-\r
 **/\r
 \r
 #include <assert.h>\r
@@ -76,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
@@ -201,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
@@ -228,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