Fix an embedder test with leaked page object

fpdfsdk/fsdk_baseform_embeddertest.cpp

Index: fpdfsdk/fsdk_baseform_embeddertest.cpp
diff --git a/fpdfsdk/fsdk_baseform_embeddertest.cpp b/fpdfsdk/fsdk_baseform_embeddertest.cpp
index 622f1a8c04ce3ff5aeff1a3852f936c544e4bfea..6e9d6b8226996005999f10eb3fa64429098a0db5 100644
--- a/fpdfsdk/fsdk_baseform_embeddertest.cpp
+++ b/fpdfsdk/fsdk_baseform_embeddertest.cpp
@@ -26,9 +26,12 @@ class FSDKBaseFormEmbeddertest : public EmbedderTest {};
 
 TEST_F(FSDKBaseFormEmbeddertest, CBA_AnnotIterator) {
   EXPECT_TRUE(OpenDocument("annotiter.pdf"));
-  EXPECT_TRUE(LoadPage(0));
-  EXPECT_TRUE(LoadPage(1));
-  EXPECT_TRUE(LoadPage(2));
+  FPDF_PAGE page0 = LoadPage(0);
+  FPDF_PAGE page1 = LoadPage(1);
+  FPDF_PAGE page2 = LoadPage(2);
+  EXPECT_TRUE(page0);
+  EXPECT_TRUE(page1);
+  EXPECT_TRUE(page2);
 
   CFX_FloatRect LeftBottom(200, 200, 220, 220);
   CFX_FloatRect RightBottom(400, 201, 420, 221);
@@ -39,7 +42,9 @@ TEST_F(FSDKBaseFormEmbeddertest, CBA_AnnotIterator) {
       CPDFSDK_Document::FromFPDFFormHandle(form_handle());
   {
     // Page 0 specifies "row order".
-    CBA_AnnotIterator iter(pSDKDoc->GetPageView(0), "Widget", "");
+    CBA_AnnotIterator iter(

[Tom Sepez, 2016/08/19 20:41:18]

I don't understand why these should change.  UnderLying is an implementation
detail and shouldn't be used in tests.

[Tom Sepez, 2016/08/19 21:02:16]

Is this where the comment about ref-counts kicks in?  If so, we should keep the
result of getpageview in a local and release it later on,too.

+        pSDKDoc->GetPageView(UnderlyingFromFPDFPage(page0), true), "Widget",
+        "");
     CPDFSDK_Annot* pAnnot = iter.GetFirstAnnot();
     CheckRect(pAnnot->GetRect(), RightTop);
     pAnnot = iter.GetNextAnnot(pAnnot);
@@ -64,7 +69,9 @@ TEST_F(FSDKBaseFormEmbeddertest, CBA_AnnotIterator) {
   }
   {
     // Page 1 specifies "column order"
-    CBA_AnnotIterator iter(pSDKDoc->GetPageView(1), "Widget", "");
+    CBA_AnnotIterator iter(
+        pSDKDoc->GetPageView(UnderlyingFromFPDFPage(page1), true), "Widget",
+        "");
     CPDFSDK_Annot* pAnnot = iter.GetFirstAnnot();
     CheckRect(pAnnot->GetRect(), RightTop);
     pAnnot = iter.GetNextAnnot(pAnnot);
@@ -89,7 +96,9 @@ TEST_F(FSDKBaseFormEmbeddertest, CBA_AnnotIterator) {
   }
   {
     // Page 2 specifies "struct order"
-    CBA_AnnotIterator iter(pSDKDoc->GetPageView(2), "Widget", "");
+    CBA_AnnotIterator iter(
+        pSDKDoc->GetPageView(UnderlyingFromFPDFPage(page2), true), "Widget",
+        "");
     CPDFSDK_Annot* pAnnot = iter.GetFirstAnnot();
     CheckRect(pAnnot->GetRect(), LeftBottom);
     pAnnot = iter.GetNextAnnot(pAnnot);
@@ -112,4 +121,8 @@ TEST_F(FSDKBaseFormEmbeddertest, CBA_AnnotIterator) {
     pAnnot = iter.GetPrevAnnot(pAnnot);
     EXPECT_EQ(iter.GetLastAnnot(), pAnnot);
   }
+
+  UnloadPage(page2);
+  UnloadPage(page1);
+  UnloadPage(page0);
 }