diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-05-09 15:05:06 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-05-09 15:05:06 +0200 |
| commit | 95fe976d251268767e433c25e0c85c02691f7144 (patch) | |
| tree | f58cf5b0cac795215cfb92328d19ae447225c7df | |
| parent | cb6c08fa91cb992571a2baacf8bc7e3507c89c55 (diff) | |
| parent | e201fcd6146e1dba2a4c90623fdeea39abda2389 (diff) | |
Merge remote-tracking branch 'origin/4.3'
Change-Id: Ia317fd54d0ecb9dc6111dd506b925542f04cb1c9
| -rw-r--r-- | app/perfsymboltable.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/perfsymboltable.cpp b/app/perfsymboltable.cpp index 8aad5f9..1e60019 100644 --- a/app/perfsymboltable.cpp +++ b/app/perfsymboltable.cpp @@ -117,7 +117,8 @@ static bool accessDsoMem(Dwfl *dwfl, const PerfUnwind::UnwindInfo *ui, Dwarf_Add Dwarf_Word *result, uint wordWidth) { // TODO: Take the pgoff into account? Or does elf_getdata do that already? - Dwfl_Module *mod = dwfl_addrmodule(dwfl, addr); + Dwfl_Module *mod = dwfl ? dwfl_addrmodule(dwfl, addr) : nullptr; + if (!mod) { mod = ui->unwind->reportElf(addr, ui->sample->pid()); if (!mod) |