Update question validation logic, move the check pointer from after user input to...

[mirror_edk2.git] / MdeModulePkg / Universal / SetupBrowserDxe / IfrParse.c

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
index ed06f1c9cd0811706a8e4ca51cd7a9ce3eb78959..b4f045df601ae543f46ae214729fce4d54bedfc9 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
@@ -286,13 +286,15 @@ CreateQuestion (
   Allocate a FORM_EXPRESSION node.\r
 \r
   @param  Form                   The Form associated with this Expression\r
+  @param  OpCode                 The binary opcode data.\r
 \r
   @return Pointer to a FORM_EXPRESSION data structure.\r
 \r
 **/\r
 FORM_EXPRESSION *\r
 CreateExpression (\r
-  IN OUT FORM_BROWSER_FORM        *Form\r
+  IN OUT FORM_BROWSER_FORM        *Form,\r
+  IN     UINT8                    *OpCode\r
   )\r
 {\r
   FORM_EXPRESSION  *Expression;\r
@@ -301,6 +303,7 @@ CreateExpression (
   ASSERT (Expression != NULL);\r
   Expression->Signature = FORM_EXPRESSION_SIGNATURE;\r
   InitializeListHead (&Expression->OpCodeListHead);\r
+  Expression->OpCode = (EFI_IFR_OP_HEADER *) OpCode;\r
 \r
   return Expression;\r
 }\r
@@ -1466,7 +1469,7 @@ ParseOpCodes (
       // Create sub expression nested in MAP opcode\r
       //\r
       if (CurrentExpression == NULL && MapScopeDepth > 0) {\r
-        CurrentExpression = CreateExpression (CurrentForm);\r
+        CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
         ASSERT (MapExpressionList != NULL);\r
         InsertTailList (MapExpressionList, &CurrentExpression->Link);\r
         if (Scope == 0) {\r
@@ -2048,7 +2051,7 @@ ParseOpCodes (
       //\r
       // Create an Expression node\r
       //\r
-      CurrentExpression = CreateExpression (CurrentForm);\r
+      CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
       CopyMem (&CurrentExpression->Error, &((EFI_IFR_INCONSISTENT_IF *) OpCodeData)->Error, sizeof (EFI_STRING_ID));\r
 \r
       if (Operand == EFI_IFR_NO_SUBMIT_IF_OP) {\r
@@ -2072,7 +2075,7 @@ ParseOpCodes (
       //\r
       // Create an Expression node\r
       //\r
-      CurrentExpression = CreateExpression (CurrentForm);\r
+      CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
       CopyMem (&CurrentExpression->Error, &((EFI_IFR_WARNING_IF *) OpCodeData)->Warning, sizeof (EFI_STRING_ID));\r
       CurrentExpression->TimeOut = ((EFI_IFR_WARNING_IF *) OpCodeData)->TimeOut;\r
       CurrentExpression->Type    = EFI_HII_EXPRESSION_WARNING_IF;\r
@@ -2091,7 +2094,7 @@ ParseOpCodes (
       //\r
       // Question and Option will appear in scope of this OpCode\r
       //\r
-      CurrentExpression = CreateExpression (CurrentForm);\r
+      CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
       CurrentExpression->Type = EFI_HII_EXPRESSION_SUPPRESS_IF;\r
 \r
       if (CurrentForm == NULL) {\r
@@ -2121,7 +2124,7 @@ ParseOpCodes (
       //\r
       // Questions will appear in scope of this OpCode\r
       //\r
-      CurrentExpression = CreateExpression (CurrentForm);\r
+      CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
       CurrentExpression->Type = EFI_HII_EXPRESSION_GRAY_OUT_IF;\r
       InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
       PushConditionalExpression(CurrentExpression, ExpressStatement);\r
@@ -2169,7 +2172,7 @@ ParseOpCodes (
     // Expression\r
     //\r
     case EFI_IFR_VALUE_OP:\r
-      CurrentExpression = CreateExpression (CurrentForm);\r
+      CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
       CurrentExpression->Type = EFI_HII_EXPRESSION_VALUE;\r
       InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
 \r
@@ -2201,7 +2204,7 @@ ParseOpCodes (
       break;\r
 \r
     case EFI_IFR_RULE_OP:\r
-      CurrentExpression = CreateExpression (CurrentForm);\r
+      CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
       CurrentExpression->Type = EFI_HII_EXPRESSION_RULE;\r
 \r
       CurrentExpression->RuleId = ((EFI_IFR_RULE *) OpCodeData)->RuleId;\r
@@ -2217,7 +2220,7 @@ ParseOpCodes (
       break;\r
 \r
     case EFI_IFR_READ_OP:\r
-      CurrentExpression = CreateExpression (CurrentForm);\r
+      CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
       CurrentExpression->Type = EFI_HII_EXPRESSION_READ;\r
       InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
 \r
@@ -2239,7 +2242,7 @@ ParseOpCodes (
       break;\r
 \r
     case EFI_IFR_WRITE_OP:\r
-      CurrentExpression = CreateExpression (CurrentForm);\r
+      CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
       CurrentExpression->Type = EFI_HII_EXPRESSION_WRITE;\r
       InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
 \r
@@ -2366,7 +2369,7 @@ ParseOpCodes (
       //\r
       // Parent statement end tag found, update ParentStatement info.\r
       //\r
-      if (IsStatementOpCode(ScopeOpCode) && ParentStatement->Operand == ScopeOpCode) {\r
+      if (IsStatementOpCode(ScopeOpCode) && (ParentStatement != NULL) && (ParentStatement->Operand == ScopeOpCode)) {\r
         ParentStatement  = ParentStatement->ParentStatement;\r
       }\r
 \r