Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9c43caf authored by Christopher Ferris's avatar Christopher Ferris Committed by android-build-merger
Browse files

Merge "Fix memory leak in UnwinderFromPid object." am: 3c1d6b83 

am: e0e04a49

Change-Id: I93394744468708e4380a9397de32b48c68f7e74f
parents b0015944 e0e04a49

libunwindstack/include/unwindstack/DexFiles.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -40,7 +40,7 @@ class DexFiles : public Global { 
 public:

 public:

  explicit DexFiles(std::shared_ptr<Memory>& memory);

  explicit DexFiles(std::shared_ptr<Memory>& memory);

  DexFiles(std::shared_ptr<Memory>& memory, std::vector<std::string>& search_libs);

  DexFiles(std::shared_ptr<Memory>& memory, std::vector<std::string>& search_libs);

  ~DexFiles();

  virtual ~DexFiles();





  DexFile* GetDexFile(uint64_t dex_file_offset, MapInfo* info);

  DexFile* GetDexFile(uint64_t dex_file_offset, MapInfo* info);

libunwindstack/include/unwindstack/JitDebug.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ class JitDebug : public Global { 
 public:

 public:

  explicit JitDebug(std::shared_ptr<Memory>& memory);

  explicit JitDebug(std::shared_ptr<Memory>& memory);

  JitDebug(std::shared_ptr<Memory>& memory, std::vector<std::string>& search_libs);

  JitDebug(std::shared_ptr<Memory>& memory, std::vector<std::string>& search_libs);

  ~JitDebug();

  virtual ~JitDebug();





  Elf* GetElf(Maps* maps, uint64_t pc);

  Elf* GetElf(Maps* maps, uint64_t pc);

libunwindstack/include/unwindstack/Unwinder.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -72,7 +72,7 @@ class Unwinder { 
    frames_.reserve(max_frames);

    frames_.reserve(max_frames);

  }

  }





  ~Unwinder() = default;

  virtual ~Unwinder() = default;





  void Unwind(const std::vector<std::string>* initial_map_names_to_skip = nullptr,

  void Unwind(const std::vector<std::string>* initial_map_names_to_skip = nullptr,

              const std::vector<std::string>* map_suffixes_to_ignore = nullptr);

              const std::vector<std::string>* map_suffixes_to_ignore = nullptr);
@@ -124,7 +124,7 @@ class Unwinder { 
class UnwinderFromPid : public Unwinder {

class UnwinderFromPid : public Unwinder {

 public:

 public:

  UnwinderFromPid(size_t max_frames, pid_t pid) : Unwinder(max_frames), pid_(pid) {}

  UnwinderFromPid(size_t max_frames, pid_t pid) : Unwinder(max_frames), pid_(pid) {}

  ~UnwinderFromPid() = default;

  virtual ~UnwinderFromPid() = default;





  bool Init(ArchEnum arch);

  bool Init(ArchEnum arch);