2 files changed, 29 insertions, 2 deletions
diff --git a/core/fpdfdoc/cpdf_dest.cpp b/core/fpdfdoc/cpdf_dest.cpp
index 0098f73f66..015cdcbc09 100644
--- a/core/fpdfdoc/cpdf_dest.cpp
+++ b/core/fpdfdoc/cpdf_dest.cpp
@@ -38,7 +38,7 @@ CPDF_Dest::CPDF_Dest(CPDF_Object* pObj) : m_pObj(pObj) {}
 
 CPDF_Dest::~CPDF_Dest() {}
 
-int CPDF_Dest::GetPageIndex(CPDF_Document* pDoc) const {
+int CPDF_Dest::GetPageIndexDeprecated(CPDF_Document* pDoc) const {
   CPDF_Array* pArray = ToArray(m_pObj.Get());
   if (!pArray)
     return 0;
@@ -46,10 +46,31 @@ int CPDF_Dest::GetPageIndex(CPDF_Document* pDoc) const {
   CPDF_Object* pPage = pArray->GetDirectObjectAt(0);
   if (!pPage)
     return 0;
+
   if (pPage->IsNumber())
     return pPage->GetInteger();
+
   if (!pPage->IsDictionary())
     return 0;
+
+  return pDoc->GetPageIndex(pPage->GetObjNum());
+}
+
+int CPDF_Dest::GetDestPageIndex(CPDF_Document* pDoc) const {
+  CPDF_Array* pArray = ToArray(m_pObj.Get());
+  if (!pArray)
+    return -1;
+
+  CPDF_Object* pPage = pArray->GetDirectObjectAt(0);
+  if (!pPage)
+    return -1;
+
+  if (pPage->IsNumber())
+    return pPage->GetInteger();
+
+  if (!pPage->IsDictionary())
+    return -1;
+
   return pDoc->GetPageIndex(pPage->GetObjNum());
 }
 
diff --git a/core/fpdfdoc/cpdf_dest.h b/core/fpdfdoc/cpdf_dest.h
index 584669a82d..709a2470c5 100644
--- a/core/fpdfdoc/cpdf_dest.h
+++ b/core/fpdfdoc/cpdf_dest.h
@@ -23,7 +23,13 @@ class CPDF_Dest {
 
   CPDF_Object* GetObject() const { return m_pObj.Get(); }
   ByteString GetRemoteName() const;
-  int GetPageIndex(CPDF_Document* pDoc) const;
+
+  // Deprecated. Use GetDestPageIndex instead.
+  // This method is wrong. It returns 0 for errors, when it could mean the first
+  // page as well. Keeping it avoids changing the behavior of
+  // FPDFDest_GetPageIndex().
+  int GetPageIndexDeprecated(CPDF_Document* pDoc) const;
+  int GetDestPageIndex(CPDF_Document* pDoc) const;
   uint32_t GetPageObjNum() const;
 
   // Returns the zoom mode, as one of the PDFDEST_VIEW_* values in fpdf_doc.h.