[Patch] Nt32Pkg WinNtSimpleFileSystemDxe: Correct file length.

[Patch] Nt32Pkg WinNtSimpleFileSystemDxe: Correct file length.

[Eric Dong]

In GetInfo interface, current code copy real file name buffer
with full path file length. It should use real file name
length. This patch fix this error.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
---
 .../WinNtSimpleFileSystem.c                        | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
index feef184..6cff2df 100644
--- a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
+++ b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
@@ -1,6 +1,6 @@
 /**@file
 
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -1987,8 +1987,19 @@ Returns:
   CHAR16                      *TempPointer;
 
   Size        = SIZE_OF_EFI_FILE_INFO;
-  NameSize    = StrSize (PrivateFile->FileName);
-  ResultSize  = Size + NameSize;
+
+  RealFileName  = PrivateFile->FileName;
+  TempPointer   = RealFileName;
+  while (*TempPointer) {
+    if (*TempPointer == '\\') {
+      RealFileName = TempPointer + 1;
+    }
+
+    TempPointer++;
+  }
+  NameSize = StrSize (RealFileName);
+
+  ResultSize = Size + NameSize; 
 
   Status      = EFI_BUFFER_TOO_SMALL;
   if (*BufferSize >= ResultSize) {
@@ -2056,17 +2067,6 @@ Returns:
       Info->Attribute |= EFI_FILE_DIRECTORY;
     }
 
-    RealFileName  = PrivateFile->FileName;
-    TempPointer   = RealFileName;
-
-    while (*TempPointer) {
-      if (*TempPointer == '\\') {
-        RealFileName = TempPointer + 1;
-      }
-
-      TempPointer++;
-    }
-
     if (PrivateFile->IsRootDirectory) {
       *((CHAR8 *) Buffer + Size) = 0;
     } else {
-- 
2.6.4.windows.1

Re: [Patch] Nt32Pkg WinNtSimpleFileSystemDxe: Correct file length.

[Ni, Ruiyu]

Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
> -----Original Message-----
> From: Dong, Eric
> Sent: Monday, October 10, 2016 4:36 PM
> To: edk2-devel@lists.01.org
> Cc: Ni, Ruiyu <ruiyu.ni@intel.com>
> Subject: [Patch] Nt32Pkg WinNtSimpleFileSystemDxe: Correct file length.
> 
> In GetInfo interface, current code copy real file name buffer with full path
> file length. It should use real file name length. This patch fix this error.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Eric Dong <eric.dong@intel.com>
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> ---
>  .../WinNtSimpleFileSystem.c                        | 28 +++++++++++-----------
>  1 file changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
> b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
> index feef184..6cff2df 100644
> --- a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
> +++ b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
> @@ -1,6 +1,6 @@
>  /**@file
> 
> -Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
>  This program and the accompanying materials  are licensed and made
> available under the terms and conditions of the BSD License  which
> accompanies this distribution.  The full text of the license may be found at
> @@ -1987,8 +1987,19 @@ Returns:
>    CHAR16                      *TempPointer;
> 
>    Size        = SIZE_OF_EFI_FILE_INFO;
> -  NameSize    = StrSize (PrivateFile->FileName);
> -  ResultSize  = Size + NameSize;
> +
> +  RealFileName  = PrivateFile->FileName;
> +  TempPointer   = RealFileName;
> +  while (*TempPointer) {
> +    if (*TempPointer == '\\') {
> +      RealFileName = TempPointer + 1;
> +    }
> +
> +    TempPointer++;
> +  }
> +  NameSize = StrSize (RealFileName);
> +
> +  ResultSize = Size + NameSize;
> 
>    Status      = EFI_BUFFER_TOO_SMALL;
>    if (*BufferSize >= ResultSize) {
> @@ -2056,17 +2067,6 @@ Returns:
>        Info->Attribute |= EFI_FILE_DIRECTORY;
>      }
> 
> -    RealFileName  = PrivateFile->FileName;
> -    TempPointer   = RealFileName;
> -
> -    while (*TempPointer) {
> -      if (*TempPointer == '\\') {
> -        RealFileName = TempPointer + 1;
> -      }
> -
> -      TempPointer++;
> -    }
> -
>      if (PrivateFile->IsRootDirectory) {
>        *((CHAR8 *) Buffer + Size) = 0;
>      } else {
> --
> 2.6.4.windows.1