Fix memory leak of AddressSpace::patcher_ (#795)

This was originally part of #317. This is an API-breaking change since AddressSpace is exported through the BPatch interface.
dyninst · Oct 16, 2020 · 5250435 · 5250435
1 parent 7270afc
commit 5250435
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/dyninstAPI/src/addressSpace.C b/dyninstAPI/src/addressSpace.C
@@ -91,8 +91,7 @@ AddressSpace::AddressSpace () :
     memEmulator_(NULL),
     emulateMem_(false),
     emulatePC_(false),
-    delayRelocation_(false),
-    patcher_(NULL)
+    delayRelocation_(false)
 {
 #if 0
    // Disabled for now; used by defensive mode

diff --git a/dyninstAPI/src/addressSpace.h b/dyninstAPI/src/addressSpace.h
@@ -567,14 +567,14 @@ class AddressSpace : public InstructionSource {
   public:
     Dyninst::PatchAPI::PatchMgrPtr mgr() const { assert(mgr_); return mgr_; }
     void setMgr(Dyninst::PatchAPI::PatchMgrPtr m) { mgr_ = m; }
-    void setPatcher(Dyninst::PatchAPI::Patcher* p) { patcher_ = p; }
+    void setPatcher(Dyninst::PatchAPI::Patcher::Ptr p) { patcher_ = p; }
     void initPatchAPI();
     void addMappedObject(mapped_object* obj);
-    Dyninst::PatchAPI::Patcher* patcher() { return patcher_; }
+    Dyninst::PatchAPI::Patcher::Ptr patcher() { return patcher_; }
     static bool patch(AddressSpace*);
   protected:
     Dyninst::PatchAPI::PatchMgrPtr mgr_;
-    Dyninst::PatchAPI::Patcher* patcher_;
+    Dyninst::PatchAPI::Patcher::Ptr patcher_;
 };
 
 

diff --git a/dyninstAPI/src/binaryEdit.C b/dyninstAPI/src/binaryEdit.C
@@ -299,7 +299,7 @@ BinaryEdit::~BinaryEdit()
 
 BinaryEdit *BinaryEdit::openFile(const std::string &file, 
                                  PatchMgrPtr mgr, 
-                                 Dyninst::PatchAPI::Patcher *patch,
+                                 Dyninst::PatchAPI::Patcher::Ptr patch,
                                  const std::string &member) {
     if (!OS::executableExists(file)) {
         startup_printf("%s[%d]:  failed to read file %s\n", FILE__, __LINE__, file.c_str());

diff --git a/dyninstAPI/src/binaryEdit.h b/dyninstAPI/src/binaryEdit.h
@@ -138,7 +138,7 @@ class BinaryEdit : public AddressSpace {
     // And the "open" factory method.
     static BinaryEdit *openFile(const std::string &file,
                                 Dyninst::PatchAPI::PatchMgrPtr mgr = Dyninst::PatchAPI::PatchMgrPtr(),
-                                Dyninst::PatchAPI::Patcher *patch = NULL,
+                                Dyninst::PatchAPI::Patcher::Ptr patch = Dyninst::PatchAPI::Patcher::Ptr(),
                                 const std::string &member = "");
 
     bool writeFile(const std::string &newFileName);

diff --git a/patchAPI/h/Command.h b/patchAPI/h/Command.h
@@ -81,8 +81,9 @@ class PATCHAPI_EXPORT BatchCommand : public Command {
 
 class PATCHAPI_EXPORT Patcher : public BatchCommand {
   public:
-   static Patcher* create(Dyninst::PatchAPI::PatchMgrPtr mgr) {
-      return new Patcher(mgr);
+   using Ptr = boost::shared_ptr<Patcher>;
+   static Ptr create(Dyninst::PatchAPI::PatchMgrPtr mgr) {
+      return boost::make_shared<Patcher>(mgr);
     }
     Patcher(Dyninst::PatchAPI::PatchMgrPtr mgr) : mgr_(mgr) {}
     virtual ~Patcher() {}