Fix root dictionary leak in cpdf_document_unittest

core/fpdfapi/parser/cpdf_document_unittest.cpp

 // Copyright 2016 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/fpdfapi/parser/cpdf_document.h"
 
 #include <memory>
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/parser/cpdf_array.h"
 #include "core/fpdfapi/parser/cpdf_dictionary.h"
 #include "core/fpdfapi/parser/cpdf_parser.h"
+#include "core/fxcrt/fx_memory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 CPDF_Dictionary* CreatePageTreeNode(CPDF_Array* kids,
                                     CPDF_Document* pDoc,
                                     int count) {
   CPDF_Dictionary* pageNode = new CPDF_Dictionary();
   pageNode->SetStringFor("Type", "Pages");
   pageNode->SetReferenceFor("Kids", pDoc, pDoc->AddIndirectObject(kids));
@@ skipping 38 matching lines @@
     CPDF_Array* justSix = new CPDF_Array();
     justSix->AddReference(this, AddIndirectObject(CreateNumberedPage(6)));
     CPDF_Dictionary* branch4 = CreatePageTreeNode(justSix, this, 1);
 
     CPDF_Array* allPages = new CPDF_Array();
     allPages->AddReference(this, branch2->GetObjNum());
     allPages->AddReference(this, branch3->GetObjNum());
     allPages->AddReference(this, branch4->GetObjNum());
     CPDF_Dictionary* pagesDict = CreatePageTreeNode(allPages, this, 7);
 
-    CPDF_Dictionary* root = new CPDF_Dictionary();
-    root->SetReferenceFor("Pages", this, AddIndirectObject(pagesDict));
-    m_pRootDict = root;
+    rootDict.reset(new CPDF_Dictionary());
+    rootDict->SetReferenceFor("Pages", this, AddIndirectObject(pagesDict));
+    m_pRootDict = rootDict.get();
     m_PageList.SetSize(7);
   }
+
+ private:
+  std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>> rootDict;

[Tom Sepez, 2016/10/24 16:09:52]

nit: how about root_dict_ to go with the chromium naming conventions?  Or
m_pOwnedRootDict to go with the PDFium conventions (since there's already a
m_pRootDict in CPDF_Document)

[npm, 2016/10/24 16:17:34]

Done.

 };
 
 TEST(cpdf_document, GetPages) {
   std::unique_ptr<CPDF_TestDocumentForPages> document =
       pdfium::MakeUnique<CPDF_TestDocumentForPages>();
   for (int i = 0; i < 7; i++) {
     CPDF_Dictionary* page = document->GetPage(i);
     ASSERT_TRUE(page);
     ASSERT_TRUE(page->GetObjectFor("PageNumbering"));
     EXPECT_EQ(i, page->GetIntegerFor("PageNumbering"));
   }
   CPDF_Dictionary* page = document->GetPage(7);
   EXPECT_FALSE(page);
 }
 
 TEST(cpdf_document, GetPagesReverseOrder) {
   std::unique_ptr<CPDF_TestDocumentForPages> document =
       pdfium::MakeUnique<CPDF_TestDocumentForPages>();
   for (int i = 6; i >= 0; i--) {
     CPDF_Dictionary* page = document->GetPage(i);
     ASSERT_TRUE(page);
     ASSERT_TRUE(page->GetObjectFor("PageNumbering"));
     EXPECT_EQ(i, page->GetIntegerFor("PageNumbering"));
   }
   CPDF_Dictionary* page = document->GetPage(7);
   EXPECT_FALSE(page);
 }