From 254937f0bca17649b5d213381a38ffe9ff66acec Mon Sep 17 00:00:00 2001
From: Mike Maslenkin <mike.maslenkin@gmail.com>
Date: Thu, 9 Jan 2025 21:50:12 +0300
Subject: ShellPkg: fix warnings about uninitialized variable

Dmem.c: In function 'GetImageExecutionInfo':
Dmem.c:241:10: error: 'Status' may be used uninitialized
  in this function [-Werror=maybe-uninitialized]
   return Status;
          ^~~~~~
Dmem.c:284:35: note: 'Status' was declared here
   EFI_STATUS                      Status;
                                   ^~~~~~
Dmem.c: In function 'ShellCommandRunDmem':
Dmem.c:586:27: error: 'ConformanceProfileTableAddress' may be used
  uninitialized in this function [-Werror=maybe-uninitialized]

ShellStatus = DisplayConformanceProfiles (ConformanceProfileTableAddress);
              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Dmem.c:582:27: error: 'ImageExecutionTableAddress' may be used
  uninitialized in this function [-Werror=maybe-uninitialized]

ShellStatus = DisplayImageExecutionEntries (ImageExecutionTableAddress);
              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Dmem.c:578:27: error: 'RtPropertiesTableAddress' may be used
  uninitialized in this function [-Werror=maybe-uninitialized]

ShellStatus = DisplayRtProperties (RtPropertiesTableAddress);
              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

cc1: all warnings being treated as errors

Signed-off-by: Mike Maslenkin <mike.maslenkin@gmail.com>
---
 ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
index 046cfd5270..dd3d7a7a0a 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
@@ -192,6 +192,8 @@ GetImageExecutionInfo (
 
   ptr = (CHAR8 *)ExecInfoTablePtr + 1;
 
+  Status = EFI_NOT_FOUND;
+
   for (Image = 0; Image < *NumberOfImages; Image++, ptr += InfoPtr->InfoSize) {
     InfoPtr   = (EFI_IMAGE_EXECUTION_INFO *)ptr;
     ImagePath = (CHAR16 *)(InfoPtr + 1);
@@ -287,6 +289,7 @@ DisplayConformanceProfiles (
   UINTN                           Profile;
   EFI_CONFORMANCE_PROFILES_TABLE  *ConfProfTable;
 
+  Status      = EFI_SUCCESS;
   ShellStatus = SHELL_SUCCESS;
 
   if (Address != 0) {
@@ -571,19 +574,19 @@ ShellCommandRunDmem (
             HiiDatabaseExportBufferAddress,
             ConformanceProfileTableAddress
             );
-        }
 
-        if (ShellCommandLineGetFlag (Package, L"-verbose")) {
-          if (ShellStatus == SHELL_SUCCESS) {
-            ShellStatus = DisplayRtProperties (RtPropertiesTableAddress);
-          }
+          if (ShellCommandLineGetFlag (Package, L"-verbose")) {
+            if (ShellStatus == SHELL_SUCCESS) {
+              ShellStatus = DisplayRtProperties (RtPropertiesTableAddress);
+            }
 
-          if (ShellStatus == SHELL_SUCCESS) {
-            ShellStatus = DisplayImageExecutionEntries (ImageExecutionTableAddress);
-          }
+            if (ShellStatus == SHELL_SUCCESS) {
+              ShellStatus = DisplayImageExecutionEntries (ImageExecutionTableAddress);
+            }
 
-          if (ShellStatus == SHELL_SUCCESS) {
-            ShellStatus = DisplayConformanceProfiles (ConformanceProfileTableAddress);
+            if (ShellStatus == SHELL_SUCCESS) {
+              ShellStatus = DisplayConformanceProfiles (ConformanceProfileTableAddress);
+            }
           }
         }
       } else {
-- 
cgit