Reviewed-by: Liming Gao <liming....@intel.com>
-----Original Message-----
From: Ni, Ruiyu
Sent: Wednesday, June 17, 2015 4:52 PM
To: edk2-devel@lists.sourceforge.net
Cc: Ni, Ruiyu; Gao, Liming
Subject: [Patch] MdePkg/DxeServicesLib: Return NULL GetFileBufferByFilePath
reads directory
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu...@intel.com>
Cc: Liming Gao <liming....@intel.com>
---
MdePkg/Library/DxeServicesLib/DxeServicesLib.c | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/MdePkg/Library/DxeServicesLib/DxeServicesLib.c
b/MdePkg/Library/DxeServicesLib/DxeServicesLib.c
index ef7c9ba..c8f0014 100644
--- a/MdePkg/Library/DxeServicesLib/DxeServicesLib.c
+++ b/MdePkg/Library/DxeServicesLib/DxeServicesLib.c
@@ -2,7 +2,7 @@
MDE DXE Services Library provides functions that simplify the development of
DXE Drivers.
These functions help access data from sections of FFS files or from file
path.
- Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2007 - 2015, 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 @@ -796,18 +796,20 @@ GetFileBufferByFilePath (
}
if (!EFI_ERROR (Status) && (FileInfo != NULL)) {
- //
- // Allocate space for the file
- //
- ImageBuffer = AllocatePool ((UINTN)FileInfo->FileSize);
- if (ImageBuffer == NULL) {
- Status = EFI_OUT_OF_RESOURCES;
- } else {
+ if ((FileInfo->Attribute & EFI_FILE_DIRECTORY) == 0) {
//
- // Read the file into the buffer we allocated
+ // Allocate space for the file
//
- ImageBufferSize = (UINTN)FileInfo->FileSize;
- Status = FileHandle->Read (FileHandle,
&ImageBufferSize, ImageBuffer);
+ ImageBuffer = AllocatePool ((UINTN)FileInfo->FileSize);
+ if (ImageBuffer == NULL) {
+ Status = EFI_OUT_OF_RESOURCES;
+ } else {
+ //
+ // Read the file into the buffer we allocated
+ //
+ ImageBufferSize = (UINTN)FileInfo->FileSize;
+ Status = FileHandle->Read (FileHandle,
&ImageBufferSize, ImageBuffer);
+ }
}
}
}
--
1.9.5.msysgit.1
------------------------------------------------------------------------------
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel
