MdeModulePkg/ReportStatusCodeRouter: Clear RSC Data buffer if Data is NULL

[mirror_edk2.git] / MdeModulePkg / Universal / ReportStatusCodeRouter / RuntimeDxe / ReportStatusCodeRouterRuntimeDxe.c

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c
index 6ca7e180ebb342821675389cae9468e5b5249413..5df83027c62db821988bd8e7bf28c1af4ce005fb 100644 (file)
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c
@@ -3,6 +3,7 @@
   and Status Code Runtime Protocol.\r
 \r
   Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) Microsoft Corporation.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -307,6 +308,9 @@ ReportDispatcher (
     }\r
     if (Data != NULL) {\r
       CopyMem (&RscData->Data, Data, Data->HeaderSize + Data->Size);\r
+    } else {\r
+      ZeroMem (&RscData->Data, sizeof (RscData->Data));\r
+      RscData->Data.HeaderSize = sizeof (RscData->Data);\r
     }\r
 \r
     Status = gBS->SignalEvent (CallbackEntry->Event);\r