Skip to content

Commit 299c632

Browse files
Merge pull request #7394 from adrian-prantl/114072834
Add missing nullptr checks
2 parents 9cdc27a + b947ab3 commit 299c632

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

lldb/source/Expression/UserExpression.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ UserExpression::Evaluate(ExecutionContext &exe_ctx,
261261
target->GetUserExpressionForLanguage(expr, full_prefix, language,
262262
desired_type, options, ctx_obj,
263263
error));
264-
if (error.Fail()) {
264+
if (error.Fail() || !user_expression_sp) {
265265
LLDB_LOG(log, "== [UserExpression::Evaluate] Getting expression: {0} ==",
266266
error.AsCString());
267267
return lldb::eExpressionSetupError;

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,6 +1053,10 @@ SwiftLanguageRuntimeImpl::RunObjectDescriptionExpr(ValueObject &object,
10531053
frame_sp
10541054
= m_process.GetThreadList().GetSelectedThread()
10551055
->GetSelectedFrame(DoNoSelectMostRelevantFrame);
1056+
if (!frame_sp) {
1057+
log->Printf("no execution context to run expression in");
1058+
return false;
1059+
}
10561060
auto eval_result = m_process.GetTarget().EvaluateExpression(
10571061
expr_string,
10581062
frame_sp.get(),

0 commit comments

Comments
 (0)