diff options
| author | Christopher Ferris <cferris@google.com> | 2020-08-27 22:17:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-27 22:17:09 +0000 |
| commit | db503ecba29ac03576960e8471e0094be5decd1d (patch) | |
| tree | 43fd7be4910759890916bed48c91b4b100997ba4 /libunwindstack/Unwinder.cpp | |
| parent | 025321862c321d00a4054222be61e2455cfb8509 (diff) | |
| parent | 8b0cabe36fe1fe62a7456e7e5abb9ab34437dae1 (diff) | |
Merge "Fix nullptr dereference." am: bb81b77895 am: 1300d1cfe9 am: 8b0cabe36f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1413809
Change-Id: Icaa802bc11ff298b765cb4ff93f8c8ff7ad7d309
Diffstat (limited to 'libunwindstack/Unwinder.cpp')
| -rw-r--r-- | libunwindstack/Unwinder.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libunwindstack/Unwinder.cpp b/libunwindstack/Unwinder.cpp index b904632ef5..4e7096ec1b 100644 --- a/libunwindstack/Unwinder.cpp +++ b/libunwindstack/Unwinder.cpp @@ -76,6 +76,7 @@ void Unwinder::FillInDexFrame() { } else { frame->rel_pc = dex_pc; warnings_ |= WARNING_DEX_PC_NOT_IN_MAP; + return; } if (!resolve_names_) { |