From ba0ef7a124e9aecc2d0113598c851bae4710b887 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sat, 9 Apr 2022 14:49:10 -0400
Subject: Replace PointerHolder with std::shared_ptr in the rest of the code

Increase to POINTERHOLDER_TRANSITION=3

patrepl s/PointerHolder/std::shared_ptr/g **/*.cc **/*.hh
patrepl s/make_pointer_holder/std::make_shared/g **/*.cc
patrepl s/make_array_pointer_holder/QUtil::make_shared_array/g **/*.cc
patrepl s,qpdf/std::shared_ptr,qpdf/PointerHolder, **/*.cc **/*.hh
git restore include/qpdf/PointerHolder.hh
git restore libtests/pointer_holder.cc
cleanpatch
./format-code
---
 fuzz/qpdf_fuzzer.cc                   | 28 ++++++++++++++--------------
 fuzz/standalone_fuzz_target_runner.cc |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'fuzz')

diff --git a/fuzz/qpdf_fuzzer.cc b/fuzz/qpdf_fuzzer.cc
index 3c76bbc9..15469782 100644
--- a/fuzz/qpdf_fuzzer.cc
+++ b/fuzz/qpdf_fuzzer.cc
@@ -34,9 +34,9 @@ class FuzzHelper
     void run();
 
   private:
-    PointerHolder<QPDF> getQpdf();
-    PointerHolder<QPDFWriter> getWriter(PointerHolder<QPDF>);
-    void doWrite(PointerHolder<QPDFWriter> w);
+    std::shared_ptr<QPDF> getQpdf();
+    std::shared_ptr<QPDFWriter> getWriter(std::shared_ptr<QPDF>);
+    void doWrite(std::shared_ptr<QPDFWriter> w);
     void testWrite();
     void testPages();
     void testOutlines();
@@ -52,27 +52,27 @@ FuzzHelper::FuzzHelper(unsigned char const* data, size_t size) :
 {
 }
 
-PointerHolder<QPDF>
+std::shared_ptr<QPDF>
 FuzzHelper::getQpdf()
 {
-    auto is = PointerHolder<InputSource>(
+    auto is = std::shared_ptr<InputSource>(
         new BufferInputSource("fuzz input", &this->input_buffer));
-    auto qpdf = make_pointer_holder<QPDF>();
+    auto qpdf = std::make_shared<QPDF>();
     qpdf->processInputSource(is);
     return qpdf;
 }
 
-PointerHolder<QPDFWriter>
-FuzzHelper::getWriter(PointerHolder<QPDF> qpdf)
+std::shared_ptr<QPDFWriter>
+FuzzHelper::getWriter(std::shared_ptr<QPDF> qpdf)
 {
-    auto w = make_pointer_holder<QPDFWriter>(*qpdf);
+    auto w = std::make_shared<QPDFWriter>(*qpdf);
     w->setOutputPipeline(&this->discard);
     w->setDecodeLevel(qpdf_dl_all);
     return w;
 }
 
 void
-FuzzHelper::doWrite(PointerHolder<QPDFWriter> w)
+FuzzHelper::doWrite(std::shared_ptr<QPDFWriter> w)
 {
     try {
         w->write();
@@ -88,8 +88,8 @@ FuzzHelper::testWrite()
 {
     // Write in various ways to exercise QPDFWriter
 
-    PointerHolder<QPDF> q;
-    PointerHolder<QPDFWriter> w;
+    std::shared_ptr<QPDF> q;
+    std::shared_ptr<QPDFWriter> w;
 
     q = getQpdf();
     w = getWriter(q);
@@ -126,7 +126,7 @@ FuzzHelper::testPages()
 {
     // Parse all content streams, and exercise some helpers that
     // operate on pages.
-    PointerHolder<QPDF> q = getQpdf();
+    std::shared_ptr<QPDF> q = getQpdf();
     QPDFPageDocumentHelper pdh(*q);
     QPDFPageLabelDocumentHelper pldh(*q);
     QPDFOutlineDocumentHelper odh(*q);
@@ -168,7 +168,7 @@ FuzzHelper::testPages()
 void
 FuzzHelper::testOutlines()
 {
-    PointerHolder<QPDF> q = getQpdf();
+    std::shared_ptr<QPDF> q = getQpdf();
     std::list<std::vector<QPDFOutlineObjectHelper>> queue;
     QPDFOutlineDocumentHelper odh(*q);
     queue.push_back(odh.getTopLevelOutlines());
diff --git a/fuzz/standalone_fuzz_target_runner.cc b/fuzz/standalone_fuzz_target_runner.cc
index 066764a2..143f4e6f 100644
--- a/fuzz/standalone_fuzz_target_runner.cc
+++ b/fuzz/standalone_fuzz_target_runner.cc
@@ -8,7 +8,7 @@ int
 main(int argc, char** argv)
 {
     for (int i = 1; i < argc; i++) {
-        PointerHolder<char> file_buf;
+        std::shared_ptr<char> file_buf;
         size_t size = 0;
         QUtil::read_file_into_memory(argv[i], file_buf, size);
         LLVMFuzzerTestOneInput(
-- 
cgit v1.2.3-54-g00ecf