From bffbf91d5dc6388e7e66172b57e4438be17dc470 Mon Sep 17 00:00:00 2001 From: shafik Date: Thu, 24 Sep 2020 14:31:31 -0700 Subject: [PATCH] [LLDB] Add a defensive check for member__f_ I only have a crash log and was not able to come up with a test case for this. rdar://problem/69403150 (cherry picked from commit a079f619b5a1959af8af37cabdea27ae542903db) --- .../Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp index 43c51e75e6a88..47cd9db25c3ea 100644 --- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp @@ -155,6 +155,9 @@ CPPLanguageRuntime::FindLibCppStdFunctionCallableInfo( member__f_ = sub_member__f_; } + if (!member__f_) + return optional_info; + lldb::addr_t member__f_pointer_value = member__f_->GetValueAsUnsigned(0); optional_info.member__f_pointer_value = member__f_pointer_value;