commit c93f1f31d56f2cafffd84750563397782a68fa58
author Lei Zhang <thestig@chromium.org> Tue Feb 26 20:20:49 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Feb 26 20:20:49 2019 +0000
tree 5c4f5c2ea98cfb0ef436a1014a1fb50358cf23b6
parent f496e25eec4599397aa1b904e26e1e5cc5360a4b

Save results from FPDF_GetFieldAttr() calls.

FPDF_GetFieldAttr() is recursive, so avoid unnecessarily calling it
repeatedly with the same field name.

Change-Id: I28938f524ac46db3de2c7719620394076158791f
Reviewed-on: https://pdfium-review.googlesource.com/c/51234
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>

core/fpdfdoc/cpvt_generateap.cpp

diff --git a/core/fpdfdoc/cpvt_generateap.cpp b/core/fpdfdoc/cpvt_generateap.cpp
index 8f28c65..af4cef3 100644
--- a/core/fpdfdoc/cpvt_generateap.cpp
+++ b/core/fpdfdoc/cpvt_generateap.cpp
@@ -1079,23 +1079,16 @@
   }
   switch (type) {
     case CPVT_GenerateAP::kTextField: {
-      WideString swValue =
-          FPDF_GetFieldAttr(pAnnotDict, pdfium::form_fields::kV)
-              ? FPDF_GetFieldAttr(pAnnotDict, pdfium::form_fields::kV)
-                    ->GetUnicodeText()
-              : WideString();
-      int32_t nAlign = FPDF_GetFieldAttr(pAnnotDict, "Q")
-                           ? FPDF_GetFieldAttr(pAnnotDict, "Q")->GetInteger()
-                           : 0;
-      uint32_t dwFlags =
-          FPDF_GetFieldAttr(pAnnotDict, pdfium::form_fields::kFf)
-              ? FPDF_GetFieldAttr(pAnnotDict, pdfium::form_fields::kFf)
-                    ->GetInteger()
-              : 0;
-      uint32_t dwMaxLen =
-          FPDF_GetFieldAttr(pAnnotDict, "MaxLen")
-              ? FPDF_GetFieldAttr(pAnnotDict, "MaxLen")->GetInteger()
-              : 0;
+      const CPDF_Object* pV =
+          FPDF_GetFieldAttr(pAnnotDict, pdfium::form_fields::kV);
+      WideString swValue = pV ? pV->GetUnicodeText() : WideString();
+      const CPDF_Object* pQ = FPDF_GetFieldAttr(pAnnotDict, "Q");
+      int32_t nAlign = pQ ? pQ->GetInteger() : 0;
+      const CPDF_Object* pFf =
+          FPDF_GetFieldAttr(pAnnotDict, pdfium::form_fields::kFf);
+      uint32_t dwFlags = pFf ? pFf->GetInteger() : 0;
+      const CPDF_Object* pMaxLen = FPDF_GetFieldAttr(pAnnotDict, "MaxLen");
+      uint32_t dwMaxLen = pMaxLen ? pMaxLen->GetInteger() : 0;
       CPVT_FontMap map(
           pDoc, pStreamDict ? pStreamDict->GetDictFor("Resources") : nullptr,
           pDefFont, font_name);
@@ -1153,11 +1146,9 @@
       break;
     }
     case CPVT_GenerateAP::kComboBox: {
-      WideString swValue =
-          FPDF_GetFieldAttr(pAnnotDict, pdfium::form_fields::kV)
-              ? FPDF_GetFieldAttr(pAnnotDict, pdfium::form_fields::kV)
-                    ->GetUnicodeText()
-              : WideString();
+      const CPDF_Object* pV =
+          FPDF_GetFieldAttr(pAnnotDict, pdfium::form_fields::kV);
+      WideString swValue = pV ? pV->GetUnicodeText() : WideString();
       CPVT_FontMap map(
           pDoc, pStreamDict ? pStreamDict->GetDictFor("Resources") : nullptr,
           pDefFont, font_name);