MdeModulePkg: Fix various typos

[mirror_edk2.git] / MdeModulePkg / Universal / FvSimpleFileSystemDxe / FvSimpleFileSystem.c

diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c
index e39036aed960f701fd0e970dff650abb3a451683..f33f7f7216c3881e319414ffdfd686d4e2105b95 100644 (file)
--- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c
+++ b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c
@@ -12,15 +12,9 @@
   from the UEFI shell. It is entirely read-only.\r
 \r
 Copyright (c) 2014, ARM Limited. All rights reserved.\r
-Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r
 \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
-\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
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -368,7 +362,7 @@ RemoveLastItemFromPath (
 \r
   @param  Path          The pointer to the string containing the path.\r
 \r
-  @retval NULL          An error occured.\r
+  @retval NULL          An error occurred.\r
   @return Path in all other instances.\r
 \r
 **/\r
@@ -704,6 +698,7 @@ FvSimpleFileSystemRead (
 \r
     Status = FvFsReadFile (File->Instance->FvProtocol, File->FvFileInfo, &FileSize, &FileBuffer);\r
     if (EFI_ERROR (Status)) {\r
+      FreePool (FileBuffer);\r
       return EFI_DEVICE_ERROR;\r
     }\r
 \r
@@ -714,6 +709,8 @@ FvSimpleFileSystemRead (
     CopyMem (Buffer, (UINT8*)FileBuffer + File->Position, *BufferSize);\r
     File->Position += *BufferSize;\r
 \r
+    FreePool (FileBuffer);\r
+\r
     return EFI_SUCCESS;\r
   }\r
 }\r
@@ -826,7 +823,7 @@ FvSimpleFileSystemSetPosition (
     // Reset directory position to first entry\r
     //\r
     if (File->DirReadNext) {\r
-      File->DirReadNext = FVFS_GET_FIRST_FILE_INFO (Instance); \r
+      File->DirReadNext = FVFS_GET_FIRST_FILE_INFO (Instance);\r
     }\r
   } else if (Position == 0xFFFFFFFFFFFFFFFFull) {\r
     File->Position = File->FvFileInfo->FileInfo.FileSize;\r
@@ -942,9 +939,9 @@ FvSimpleFileSystemGetInfo (
     FsInfoOut = (EFI_FILE_SYSTEM_INFO *) Buffer;\r
 \r
     CopyMem (FsInfoOut, &mFsInfoTemplate, sizeof (EFI_FILE_SYSTEM_INFO));\r
-    Status = StrnCpyS ( FsInfoOut->VolumeLabel, \r
-                        (*BufferSize - OFFSET_OF (EFI_FILE_SYSTEM_INFO, VolumeLabel)) / sizeof (CHAR16), \r
-                        Instance->VolumeLabel, \r
+    Status = StrnCpyS ( FsInfoOut->VolumeLabel,\r
+                        (*BufferSize - OFFSET_OF (EFI_FILE_SYSTEM_INFO, VolumeLabel)) / sizeof (CHAR16),\r
+                        Instance->VolumeLabel,\r
                         StrLen (Instance->VolumeLabel)\r
                         );\r
     ASSERT_EFI_ERROR (Status);\r
@@ -967,9 +964,9 @@ FvSimpleFileSystemGetInfo (
     }\r
 \r
     FsVolumeLabel = (EFI_FILE_SYSTEM_VOLUME_LABEL*) Buffer;\r
-    Status        = StrnCpyS (FsVolumeLabel->VolumeLabel, \r
+    Status        = StrnCpyS (FsVolumeLabel->VolumeLabel,\r
                               (*BufferSize - OFFSET_OF (EFI_FILE_SYSTEM_VOLUME_LABEL, VolumeLabel)) / sizeof (CHAR16),\r
-                              Instance->VolumeLabel, \r
+                              Instance->VolumeLabel,\r
                               StrLen (Instance->VolumeLabel)\r
                               );\r
     ASSERT_EFI_ERROR (Status);\r
@@ -1022,7 +1019,7 @@ FvSimpleFileSystemSetInfo (
   IN VOID                     *Buffer\r
   )\r
 {\r
-  if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid) || \r
+  if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid) ||\r
       CompareGuid (InformationType, &gEfiFileInfoGuid) ||\r
       CompareGuid (InformationType, &gEfiFileSystemVolumeLabelInfoIdGuid)) {\r
     return EFI_WRITE_PROTECTED;\r