commit 533bbc831c1f94c05041443ea0ca44f1c5d0b748
author Lei Zhang <thestig@chromium.org> Fri Mar 28 18:42:19 2025 -0700
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Mar 28 18:42:19 2025 -0700
tree b933d1b812cf83f9fec43b927501dadadbb14e8f
parent 098ed663b042acd3ea4f6c9c7b6869b1709f2ab8

Fix various nits in cpdf_interactiveform.cpp

- Rename a constant to kFoo and make it constexpr.
- Remove a variable in GenerateNewFontResourceName().
- Avoid potentially wasted work in GetFormFont().
- Remove a useless pointer assignment in AddTerminalField().
- Remove a variable in ExportToFDF().

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

core/fpdfdoc/cpdf_interactiveform.cpp

diff --git a/core/fpdfdoc/cpdf_interactiveform.cpp b/core/fpdfdoc/cpdf_interactiveform.cpp
index a3dd6eb..5a18dda 100644
--- a/core/fpdfdoc/cpdf_interactiveform.cpp
+++ b/core/fpdfdoc/cpdf_interactiveform.cpp
@@ -45,7 +45,7 @@
 
 namespace {
 
-const int nMaxRecursion = 32;
+constexpr int kMaxRecursion = 32;
 
 #if BUILDFLAG(IS_WIN)
 struct PDF_FONTDATA {
@@ -136,18 +136,17 @@
 }
 
 ByteString GenerateNewFontResourceName(const CPDF_Dictionary* pResDict,
-                                       const ByteString& csPrefix) {
+                                       ByteString prefix) {
   static const char kDummyFontName[] = "ZiTi";
-  ByteString csStr = csPrefix;
-  if (csStr.IsEmpty()) {
-    csStr = kDummyFontName;
+  if (prefix.IsEmpty()) {
+    prefix = kDummyFontName;
   }
 
-  const size_t szCount = csStr.GetLength();
+  const size_t szCount = prefix.GetLength();
   size_t m = 0;
   ByteString csTmp;
   while (m < UNSAFE_TODO(strlen(kDummyFontName)) && m < szCount) {
-    csTmp += csStr[m++];
+    csTmp += prefix[m++];
   }
   while (m < UNSAFE_TODO(strlen(kDummyFontName))) {
     csTmp += '0' + m % 10;
@@ -166,7 +165,7 @@
     }
 
     if (m < szCount) {
-      csTmp += csStr[m++];
+      csTmp += prefix[m++];
     } else {
       bsNum = ByteString::FormatInteger(num++);
     }
@@ -493,7 +492,7 @@
   }
 
   int level = pParent->GetLevel() + 1;
-  if (level > nMaxRecursion) {
+  if (level > kMaxRecursion) {
     return nullptr;
   }
 
@@ -785,8 +784,11 @@
 
 RetainPtr<CPDF_Font> CPDF_InteractiveForm::GetFormFont(
     ByteString csNameTag) const {
+  if (!m_pFormDict) {
+    return nullptr;
+  }
   ByteString csAlias = PDF_NameDecode(csNameTag.AsStringView());
-  if (!m_pFormDict || csAlias.IsEmpty()) {
+  if (csAlias.IsEmpty()) {
     return nullptr;
   }
 
@@ -853,7 +855,7 @@
 
 void CPDF_InteractiveForm::LoadField(RetainPtr<CPDF_Dictionary> pFieldDict,
                                      int nLevel) {
-  if (nLevel > nMaxRecursion) {
+  if (nLevel > kMaxRecursion) {
     return;
   }
   if (!pFieldDict) {
@@ -916,8 +918,7 @@
     return;
   }
 
-  CPDF_FormField* pField = nullptr;
-  pField = m_pFieldTree->GetField(csWName);
+  CPDF_FormField* pField = m_pFieldTree->GetField(csWName);
   if (!pField) {
     RetainPtr<CPDF_Dictionary> pParent(pFieldDict);
     if (!pFieldDict->KeyExist(pdfium::form_fields::kT) &&
@@ -1096,8 +1097,8 @@
                                        fullname.AsStringView());
     if (pField->GetType() == CPDF_FormField::kCheckBox ||
         pField->GetType() == CPDF_FormField::kRadioButton) {
-      WideString csExport = pField->GetCheckValue(false);
-      ByteString csBExport = PDF_EncodeText(csExport.AsStringView());
+      ByteString csBExport =
+          PDF_EncodeText(pField->GetCheckValue(false).AsStringView());
       RetainPtr<const CPDF_Object> pOpt = pField->GetFieldAttr("Opt");
       if (pOpt) {
         pFieldDict->SetNewFor<CPDF_String>(pdfium::form_fields::kV, csBExport);