MdeModulePkg VariablePei: Return GetVariable() attr if EFI_BUFFER_TOO_SMALL

[mirror_edk2.git] / MdeModulePkg / Universal / Variable / Pei / Variable.c

diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.c b/MdeModulePkg/Universal/Variable/Pei/Variable.c
index f61465fc30456e9ddd321eeae39cec46416dd67a..f420b58165b7864dbb9f15ee500e2eb7afe87705 100644 (file)
--- a/MdeModulePkg/Universal/Variable/Pei/Variable.c
+++ b/MdeModulePkg/Universal/Variable/Pei/Variable.c
@@ -3,6 +3,7 @@
   PEI ReadOnly Varaiable2 PPI. These services operates the non volatile storage space.\r
 \r
 Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) Microsoft Corporation.<BR>\r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -1047,17 +1048,17 @@ PeiGetVariable (
     }\r
 \r
     GetVariableNameOrData (&StoreInfo, GetVariableDataPtr (Variable.CurrPtr, VariableHeader, StoreInfo.AuthFlag), VarDataSize, Data);\r
-\r
-    if (Attributes != NULL) {\r
-      *Attributes = VariableHeader->Attributes;\r
-    }\r
-\r
-    *DataSize = VarDataSize;\r
-    return EFI_SUCCESS;\r
+    Status = EFI_SUCCESS;\r
   } else {\r
-    *DataSize = VarDataSize;\r
-    return EFI_BUFFER_TOO_SMALL;\r
+    Status = EFI_BUFFER_TOO_SMALL;\r
   }\r
+\r
+  if (Attributes != NULL) {\r
+    *Attributes = VariableHeader->Attributes;\r
+  }\r
+  *DataSize = VarDataSize;\r
+\r
+  return Status;\r
 }\r
 \r
 /**\r