PcAtChipsetPkg: Fix conditionally uninitialized variables

Fixes CodeQL alerts for CWE-457:
https://cwe.mitre.org/data/definitions/457.html

Cc: Erich McMillan <emcmillan@microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Michael Kubacki <mikuback@linux.microsoft.com>
Cc: Ray Ni <ray.ni@intel.com>
Co-authored-by: Erich McMillan <emcmillan@microsoft.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Oliver Smith-Denny <osd@smith-denny.com>

diff --git a/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.c b/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.c
index 15759463f2a310a2a811348e2f789564e83a36b6..d8b9fa8376a7219027d98a7416845a704ad9427c 100644 (file)
--- a/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.c
+++ b/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.c
@@ -345,7 +345,7 @@ PcRtcInit (
   // so we can use them to get and set wakeup time.\r
   //\r
   Status = PcRtcGetWakeupTime (&Enabled, &Pending, &Time, Global);\r
-  if ((Enabled) || (!EFI_ERROR (Status))) {\r
+  if ((!EFI_ERROR (Status)) || (Enabled)) {\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -838,8 +838,11 @@ PcRtcSetWakeupTime (
     //\r
     // Just support set alarm time within 24 hours\r
     //\r
-    PcRtcGetTime (&RtcTime, &Capabilities, Global);\r
-    Status = RtcTimeFieldsValid (&RtcTime);\r
+    Status = PcRtcGetTime (&RtcTime, &Capabilities, Global);\r
+    if (!EFI_ERROR (Status)) {\r
+      Status = RtcTimeFieldsValid (&RtcTime);\r
+    }\r
+\r
     if (EFI_ERROR (Status)) {\r
       return EFI_DEVICE_ERROR;\r
     }\r