MdeModulePkg/EbcDebugger: Add check for Entry and RetEntry

Entry and RetEntry might be NULL before used.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c
index 8e305e4243a5241addcf8cf0dc931043446ae1b2..7b453fa98c2b3e4bdb12cd08734dcea9acad415c 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c
@@ -143,7 +143,7 @@ DebuggerDisplaySymbolAccrodingToAddress (
   // Find the nearest symbol address\r
   //\r
   CandidateAddress = EbdFindSymbolAddress (Address, EdbMatchSymbolTypeNearestAddress, &Object, &Entry);\r
-  if (CandidateAddress == 0 || CandidateAddress == (UINTN) -1) {\r
+  if (CandidateAddress == 0 || CandidateAddress == (UINTN) -1 || Entry == NULL) {\r
     EDBPrint (L"Symbole at Address not found!\n");\r
     return EFI_DEBUG_CONTINUE;\r
   } else if (Address != CandidateAddress) {\r

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
index 85cc275c114b028a828859bd78a58d3b865d402c..90a9b9fbd7ee16e84f80533639651436c170c159 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
@@ -2062,7 +2062,7 @@ EdbPrintSource (
                     &RetObject,\r
                     &RetEntry\r
                     );\r
-  if (SymbolAddress == 0) {\r
+  if (SymbolAddress == 0 || RetEntry == NULL) {\r
     return 0 ;\r
   }\r
 \r