commit 24cb23ae245946165aaaef259d544939c79441a4
author Tom Sepez <tsepez@chromium.org> Sat Aug 28 00:32:57 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Aug 28 00:32:57 2021 +0000
tree e6df6f2a0090175f15ae04cd06035bdac05c9844
parent 5ab165d81d8b905d60867b5fba27d00e61d4eab0

Simplify logic in CXFA_Node::ProcessNullTestValidate()

Change-Id: I21fcea603a6370bca71cb92e8d5ad4fe8a8e8ca9
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/84530
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

xfa/fxfa/parser/cxfa_node.cpp

diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index b3b4445..5b7fddf 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -2590,18 +2590,12 @@
   XFA_AttributeValue eNullTest = validate->GetNullTest();
   WideString wsNullMsg = validate->GetNullMessageText();
   if (iFlags & 0x01) {
-    XFA_EventError iRet = XFA_EventError::kSuccess;
-    if (eNullTest != XFA_AttributeValue::Disabled)
-      iRet = XFA_EventError::kError;
+    if (eNullTest == XFA_AttributeValue::Disabled)
+      return XFA_EventError::kSuccess;
 
-    if (wsNullMsg.IsEmpty())
-      return iRet;
-
-    if (eNullTest != XFA_AttributeValue::Disabled) {
+    if (!wsNullMsg.IsEmpty())
       pDocView->AddNullTestMsg(wsNullMsg);
-      return XFA_EventError::kError;
-    }
-    return XFA_EventError::kSuccess;
+    return XFA_EventError::kError;
   }
   if (wsNullMsg.IsEmpty() && bVersionFlag &&
       eNullTest != XFA_AttributeValue::Disabled) {