diff options
| author | Ruiyu Ni <ruiyu.ni@intel.com> | 2016-07-08 15:18:14 +0800 |
|---|---|---|
| committer | Ruiyu Ni <ruiyu.ni@intel.com> | 2016-07-18 10:54:59 +0800 |
| commit | 31e5b912b99e0fb39e81f70bc24a4be589191abb (patch) | |
| tree | c9bdc2f2a966a35327231d833e935b5d33571739 /ShellPkg/Application/Shell/ShellProtocol.c | |
| parent | b2c036a7f016bc8808c5eb8eb3dd5399a96664b9 (diff) | |
| download | edk2-31e5b912b99e0fb39e81f70bc24a4be589191abb.tar.gz edk2-31e5b912b99e0fb39e81f70bc24a4be589191abb.tar.bz2 edk2-31e5b912b99e0fb39e81f70bc24a4be589191abb.zip | |
ShellPkg/IsVolatileEnv: Handle memory allocation failure
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Diffstat (limited to 'ShellPkg/Application/Shell/ShellProtocol.c')
| -rw-r--r-- | ShellPkg/Application/Shell/ShellProtocol.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c index dc65b7d09a..39b0e78b32 100644 --- a/ShellPkg/Application/Shell/ShellProtocol.c +++ b/ShellPkg/Application/Shell/ShellProtocol.c @@ -1129,13 +1129,18 @@ EfiShellCreateFile( {
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
EFI_STATUS Status;
+ BOOLEAN Volatile;
//
// Is this for an environment variable
// do we start with >v
//
if (StrStr(FileName, L">v") == FileName) {
- if (!IsVolatileEnv(FileName+2)) {
+ Status = IsVolatileEnv (FileName + 2, &Volatile);
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
+ if (!Volatile) {
return (EFI_INVALID_PARAMETER);
}
*FileHandle = CreateFileInterfaceEnv(FileName+2);
@@ -1245,6 +1250,7 @@ EfiShellOpenFileByName( {
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
EFI_STATUS Status;
+ BOOLEAN Volatile;
*FileHandle = NULL;
@@ -1304,7 +1310,11 @@ EfiShellOpenFileByName( // do we start with >v
//
if (StrStr(FileName, L">v") == FileName) {
- if (!IsVolatileEnv(FileName+2) &&
+ Status = IsVolatileEnv (FileName + 2, &Volatile);
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
+ if (!Volatile &&
((OpenMode & EFI_FILE_MODE_WRITE) != 0)) {
return (EFI_INVALID_PARAMETER);
}
|