Merge pull request #1859 from shafik/69403150_findlibcppstdfunctioncallableinfo_defensive_check

shafik · web-flow · commit 09ce6417230a · 2020-09-25T15:10:39.000-07:00
[LLDB] Add a defensive check for member__f_
diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp
@@ -154,6 +154,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;

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,9 @@ CPPLanguageRuntime::FindLibCppStdFunctionCallableInfo(`
`154`	`154`	`member__f_ = sub_member__f_;`
`155`	`155`	`}`
`156`	`156`
	`157`	`+ if (!member__f_)`
	`158`	`+ return optional_info;`
	`159`	`+`
`157`	`160`	`lldb::addr_t member__f_pointer_value = member__f_->GetValueAsUnsigned(0);`
`158`	`161`
`159`	`162`	`optional_info.member__f_pointer_value = member__f_pointer_value;`