2 files changed, 5 insertions, 3 deletions
diff --git a/core/fpdfapi/page/cpdf_contentparser.h b/core/fpdfapi/page/cpdf_contentparser.h
index b18e07036c..982a624346 100644
--- a/core/fpdfapi/page/cpdf_contentparser.h
+++ b/core/fpdfapi/page/cpdf_contentparser.h
@@ -29,7 +29,9 @@ class CPDF_ContentParser {
   ~CPDF_ContentParser();
 
   ParseStatus GetStatus() const { return m_Status; }
-  CPDF_StreamContentParser* GetParser() const { return m_pParser.get(); }
+  const CPDF_AllStates* GetCurStates() const {
+    return m_pParser ? m_pParser->GetCurStates() : nullptr;
+  }
   void Start(CPDF_Page* pPage);
   void Start(CPDF_Form* pForm,
              CPDF_AllStates* pGraphicStates,
diff --git a/core/fpdfapi/page/cpdf_pageobjectholder.cpp b/core/fpdfapi/page/cpdf_pageobjectholder.cpp
index 2b7e62b535..138cb0d204 100644
--- a/core/fpdfapi/page/cpdf_pageobjectholder.cpp
+++ b/core/fpdfapi/page/cpdf_pageobjectholder.cpp
@@ -39,8 +39,8 @@ void CPDF_PageObjectHolder::ContinueParse(IFX_Pause* pPause) {
     return;
 
   m_ParseState = CONTENT_PARSED;
-  if (m_pParser->GetParser() && m_pParser->GetParser()->GetCurStates())
-    m_LastCTM = m_pParser->GetParser()->GetCurStates()->m_CTM;
+  if (m_pParser->GetCurStates())
+    m_LastCTM = m_pParser->GetCurStates()->m_CTM;
   m_pParser.reset();
 }