commit 721d020e085f9403ceccdaa530d8632756ae5635
author Lei Zhang <thestig@chromium.org> Fri Oct 12 17:43:56 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Oct 12 17:43:56 2018 +0000
tree 1d84b82c8a1ce320079eda8e06c51127d9a797c4
parent ac0a1672378b4b2e18b01080a5c149ff50abd363

Remove redundent ASSERT + if checks in CPDF_FormControl.

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

core/fpdfdoc/cpdf_formcontrol.cpp

diff --git a/core/fpdfdoc/cpdf_formcontrol.cpp b/core/fpdfdoc/cpdf_formcontrol.cpp
index 06b578d..a1f1f8f 100644
--- a/core/fpdfdoc/cpdf_formcontrol.cpp
+++ b/core/fpdfdoc/cpdf_formcontrol.cpp
@@ -59,11 +59,8 @@
   ASSERT(GetType() == CPDF_FormField::kCheckBox ||
          GetType() == CPDF_FormField::kRadioButton);
   ByteString csOn = GetOnStateName();
-  if (GetType() == CPDF_FormField::kRadioButton ||
-      GetType() == CPDF_FormField::kCheckBox) {
-    if (ToArray(FPDF_GetFieldAttr(m_pField->GetDict(), "Opt")))
-      csOn = ByteString::Format("%d", m_pField->GetControlIndex(this));
-  }
+  if (ToArray(FPDF_GetFieldAttr(m_pField->GetDict(), "Opt")))
+    csOn = ByteString::Format("%d", m_pField->GetControlIndex(this));
   if (csOn.IsEmpty())
     csOn = "Yes";
   return csOn;
@@ -73,13 +70,10 @@
   ASSERT(GetType() == CPDF_FormField::kCheckBox ||
          GetType() == CPDF_FormField::kRadioButton);
   ByteString csOn = GetOnStateName();
-  if (GetType() == CPDF_FormField::kRadioButton ||
-      GetType() == CPDF_FormField::kCheckBox) {
-    if (CPDF_Array* pArray =
-            ToArray(FPDF_GetFieldAttr(m_pField->GetDict(), "Opt"))) {
-      int iIndex = m_pField->GetControlIndex(this);
-      csOn = pArray->GetStringAt(iIndex);
-    }
+  CPDF_Array* pArray = ToArray(FPDF_GetFieldAttr(m_pField->GetDict(), "Opt"));
+  if (pArray) {
+    int iIndex = m_pField->GetControlIndex(this);
+    csOn = pArray->GetStringAt(iIndex);
   }
   if (csOn.IsEmpty())
     csOn = "Yes";