From 3cc1bab6db4251b1dbada0b0a7b70224af4bb9af Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Mon, 7 Oct 2019 15:59:55 -0600
Subject: [PATCH] MdeModulePkg/EmuRuntimeDxe: Ignore keysizes of 0

---
 MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
index ec38f94aae..2f07738598 100644
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
@@ -1943,7 +1943,7 @@ VariableCommonInitialize (
   while (i < read_cmd.bufsize) {
     // assume native endian
     UINT32 keysz = ((UINT32 *)(buf + i))[0];
-    if (keysz == 0xffffffff)
+    if (keysz == 0 || keysz == 0xffffffff)
       break; // no more entries
     UINTN valsz = ((UINT32 *)(buf + i))[1];