commit 08ee0ececdeec1f856d343f8e821f233afde3b0f
author Tom Sepez <tsepez@chromium.org> Wed Mar 27 18:35:51 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Mar 27 18:35:51 2019 +0000
tree 5853b5eadd7dfbbe4a0d0cfee1301d3fc2ff4a5f
parent 05348f4b8c2abb1205d6d6fe0cef646ce9feafd2

Retain retainable HintsScope argument.

Avoids a (probably spurious) clang-tidy warning. But the argument
is always retainable, so there isn't much reason to narrow it to an
ordinary pointer and count on the environment to keep the object
alive.

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

core/fpdfapi/parser/cpdf_data_avail.cpp

diff --git a/core/fpdfapi/parser/cpdf_data_avail.cpp b/core/fpdfapi/parser/cpdf_data_avail.cpp
index 8a3e1b8..d276fc1 100644
--- a/core/fpdfapi/parser/cpdf_data_avail.cpp
+++ b/core/fpdfapi/parser/cpdf_data_avail.cpp
@@ -57,9 +57,9 @@
 
 class HintsScope {
  public:
-  HintsScope(CPDF_ReadValidator* validator,
+  HintsScope(RetainPtr<CPDF_ReadValidator> validator,
              CPDF_DataAvail::DownloadHints* hints)
-      : validator_(validator) {
+      : validator_(std::move(validator)) {
     ASSERT(validator_);
     validator_->SetDownloadHints(hints);
   }
@@ -67,7 +67,7 @@
   ~HintsScope() { validator_->SetDownloadHints(nullptr); }
 
  private:
-  UnownedPtr<CPDF_ReadValidator> validator_;
+  RetainPtr<CPDF_ReadValidator> validator_;
 };
 
 }  // namespace
@@ -104,8 +104,7 @@
   if (!m_dwFileLen)
     return DataError;
 
-  const HintsScope hints_scope(m_pFileRead.Get(), pHints);
-
+  const HintsScope hints_scope(GetValidator(), pHints);
   while (!m_bDocAvail) {
     if (!CheckDocStatus())
       return DataNotAvailable;
@@ -805,8 +804,7 @@
   if (pdfium::ContainsKey(m_pagesLoadState, dwPage))
     return DataAvailable;
 
-  const HintsScope hints_scope(GetValidator().Get(), pHints);
-
+  const HintsScope hints_scope(GetValidator(), pHints);
   if (m_pLinearized) {
     if (dwPage == m_pLinearized->GetFirstPageNo()) {
       auto* pPageDict = m_pDocument->GetPageDictionary(safePage.ValueOrDie());
@@ -954,7 +952,7 @@
 
 CPDF_DataAvail::DocFormStatus CPDF_DataAvail::IsFormAvail(
     DownloadHints* pHints) {
-  const HintsScope hints_scope(GetValidator().Get(), pHints);
+  const HintsScope hints_scope(GetValidator(), pHints);
   return CheckAcroForm();
 }