Add in ASSERT to check out-of-bound and possible dereference of NULL pointers.

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

1 files changed, 6 insertions, 3 deletions

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
index ed77094540..fc687540be 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
@@ -773,7 +773,7 @@ IfrMatch (
     }

 

     String[Index] = GetToken (Value.Value.string, FormSet->HiiHandle);

-    if (String== NULL) {

+    if (String [Index] == NULL) {

       Status = EFI_NOT_FOUND;

       goto Done;

     }

@@ -1111,7 +1111,7 @@ IfrSpan (
     }

 

     String[Index] = GetToken (Value.Value.string, FormSet->HiiHandle);

-    if (String== NULL) {

+    if (String [Index] == NULL) {

       Status = EFI_NOT_FOUND;

       goto Done;

     }

@@ -1299,7 +1299,9 @@ CompareHiiValue (
 

 

 /**

-  Evaluate the result of a HII expression

+  Evaluate the result of a HII expression.

+

+  If Expression is NULL, then ASSERT.

 

   @param  FormSet                FormSet associated with this expression.

   @param  Form                   Form associated with this expression.

@@ -1341,6 +1343,7 @@ EvaluateExpression (
   //

   ResetExpressionStack ();

 

+  ASSERT (Expression != NULL);

   Expression->Result.Type = EFI_IFR_TYPE_OTHER;

 

   Link = GetFirstNode (&Expression->OpCodeListHead);