diff options
author | Christopher Ferris <cferris@google.com> | 2019-01-24 07:31:56 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-01-24 07:31:56 -0800 |
commit | 37268d6647112a6ca7ec9b15a14028a4cb7033f9 (patch) | |
tree | ff7c09de391238cf07db0ec79a93d1b96c935615 | |
parent | 814ee2009cf4406a99226d556befd4a3c743fe04 (diff) | |
parent | 9b208890c132f10abfdfa64025b90b5e210311bb (diff) | |
download | unwinding-37268d6647112a6ca7ec9b15a14028a4cb7033f9.tar.gz |
Merge "Fix memory leak in UnwinderFromPid object."
am: 3c1d6b836a
Change-Id: Ib56d1540c6a9835cb05084ddf66abfbfe44881da
-rw-r--r-- | libunwindstack/include/unwindstack/DexFiles.h | 2 | ||||
-rw-r--r-- | libunwindstack/include/unwindstack/JitDebug.h | 2 | ||||
-rw-r--r-- | libunwindstack/include/unwindstack/Unwinder.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libunwindstack/include/unwindstack/DexFiles.h b/libunwindstack/include/unwindstack/DexFiles.h index 0336173..67a9640 100644 --- a/libunwindstack/include/unwindstack/DexFiles.h +++ b/libunwindstack/include/unwindstack/DexFiles.h @@ -40,7 +40,7 @@ class DexFiles : public Global { public: explicit DexFiles(std::shared_ptr<Memory>& memory); DexFiles(std::shared_ptr<Memory>& memory, std::vector<std::string>& search_libs); - ~DexFiles(); + virtual ~DexFiles(); DexFile* GetDexFile(uint64_t dex_file_offset, MapInfo* info); diff --git a/libunwindstack/include/unwindstack/JitDebug.h b/libunwindstack/include/unwindstack/JitDebug.h index f64b04f..8b7b4b5 100644 --- a/libunwindstack/include/unwindstack/JitDebug.h +++ b/libunwindstack/include/unwindstack/JitDebug.h @@ -38,7 +38,7 @@ class JitDebug : public Global { public: explicit JitDebug(std::shared_ptr<Memory>& memory); JitDebug(std::shared_ptr<Memory>& memory, std::vector<std::string>& search_libs); - ~JitDebug(); + virtual ~JitDebug(); Elf* GetElf(Maps* maps, uint64_t pc); diff --git a/libunwindstack/include/unwindstack/Unwinder.h b/libunwindstack/include/unwindstack/Unwinder.h index ab239c1..f4788d7 100644 --- a/libunwindstack/include/unwindstack/Unwinder.h +++ b/libunwindstack/include/unwindstack/Unwinder.h @@ -72,7 +72,7 @@ class Unwinder { frames_.reserve(max_frames); } - ~Unwinder() = default; + virtual ~Unwinder() = default; void Unwind(const std::vector<std::string>* initial_map_names_to_skip = nullptr, const std::vector<std::string>* map_suffixes_to_ignore = nullptr); @@ -124,7 +124,7 @@ class Unwinder { class UnwinderFromPid : public Unwinder { public: UnwinderFromPid(size_t max_frames, pid_t pid) : Unwinder(max_frames), pid_(pid) {} - ~UnwinderFromPid() = default; + virtual ~UnwinderFromPid() = default; bool Init(ArchEnum arch); |