1 files changed, 16 insertions, 0 deletions
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
index b756fc6454..09a184d478 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
@@ -59,6 +59,22 @@ Abstract:
 
 #define HEADER_ALIGN(Header)  (((UINTN) (Header) + HEADER_ALIGNMENT - 1) & (~(HEADER_ALIGNMENT - 1)))
 
+#define NAMESIZE_OF_VARIABLE(Variable)  \
+          ((((Variable)->DataSize == (UINT32) -1) || \
+          ((Variable)->Attributes == (UINT32) -1) || \
+          ((Variable)->NameSize == (UINT32) -1)) ? \
+          0 : \
+          (Variable)->NameSize \
+          )
+
+#define DATASIZE_OF_VARIABLE(Variable)  \
+          ((((Variable)->DataSize == (UINT32) -1) || \
+          ((Variable)->Attributes == (UINT32) -1) || \
+          ((Variable)->NameSize == (UINT32) -1)) ? \
+          0 : \
+          (Variable)->DataSize \
+          )
+
 #define GET_VARIABLE_NAME_PTR(a)  (CHAR16 *) ((UINTN) (a) + sizeof (VARIABLE_HEADER))