diff --git a/lldb/source/API/SBDebugger.cpp b/lldb/source/API/SBDebugger.cpp index 0f1708c26b149..a22bf968f87b3 100644 --- a/lldb/source/API/SBDebugger.cpp +++ b/lldb/source/API/SBDebugger.cpp @@ -167,8 +167,11 @@ SBDebugger::GetDiagnosticFromEvent(const lldb::SBEvent &event) { SBBroadcaster SBDebugger::GetBroadcaster() { LLDB_INSTRUMENT_VA(this); - SBBroadcaster broadcaster(&m_opaque_sp->GetBroadcaster(), false); - return broadcaster; + + if (m_opaque_sp) + return SBBroadcaster(&m_opaque_sp->GetBroadcaster(), false); + + return SBBroadcaster(); } void SBDebugger::Initialize() { diff --git a/lldb/test/API/python_api/default-constructor/sb_debugger.py b/lldb/test/API/python_api/default-constructor/sb_debugger.py index b7b3a2023fbcb..98261f385bf43 100644 --- a/lldb/test/API/python_api/default-constructor/sb_debugger.py +++ b/lldb/test/API/python_api/default-constructor/sb_debugger.py @@ -20,6 +20,8 @@ def fuzz_obj(obj): obj.GetCommandInterpreter() obj.HandleCommand("nothing here") listener = obj.GetListener() + broadcaster = obj.GetBroadcaster() + broadcaster.GetName() try: obj.HandleProcessEvent(lldb.SBProcess(), lldb.SBEvent(), None, None) except Exception: