Minor code enhancement.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9724 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
index ad9eb807de130fb7158a79371a29e7e3ba3ef43e..73d36088a5e5f82ae216542582a2e8985125e9c8 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
@@ -1062,7 +1062,8 @@ BOpt_GetBootOptions (
       FreePool (HiiString);\r
     } else {\r
       NewLoadContext->Description = AllocateZeroPool (StrSize((UINT16*)LoadOptionPtr));\r
-      StrCpy(NewLoadContext->Description, (UINT16*)LoadOptionPtr);\r
+      ASSERT (NewLoadContext->Description != NULL);\r
+      StrCpy (NewLoadContext->Description, (UINT16*)LoadOptionPtr);\r
     }\r
     \r
     ASSERT (NewLoadContext->Description != NULL);\r

diff --git a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.c b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.c
index 6d78a68dd640511a755c67cfcffb9d6af5782bda..6bab4db1f091dd5adf66982bbf2a9542b000d783 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.c
+++ b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.c
@@ -1000,6 +1000,7 @@ FindChildNode (
       }\r
     }\r
     \r
+    ASSERT (CurrentChildNode != NULL);\r
     if (CurrentChildNode->EncapsulatedStreamHandle != NULL_STREAM_HANDLE) {\r
       //\r
       // If the current node is an encapsulating node, recurse into it...\r
@@ -1054,7 +1055,6 @@ FindChildNode (
         if (EFI_ERROR (Status)) {\r
           return Status;\r
         }\r
-        ASSERT (CurrentChildNode != NULL);\r
       } else {\r
         ASSERT (EFI_ERROR (ErrorStatus));\r
         return ErrorStatus;\r