1 files changed, 5 insertions, 3 deletions
diff --git a/lldb/source/Target/ThreadPlanStepInRange.cpp b/lldb/source/Target/ThreadPlanStepInRange.cpp
index 3eece2fc41b..03f6679ae32 100644
--- a/lldb/source/Target/ThreadPlanStepInRange.cpp
+++ b/lldb/source/Target/ThreadPlanStepInRange.cpp
@@ -298,10 +298,11 @@ bool ThreadPlanStepInRange::ShouldStop(Event *event_ptr) {
 }
 
 void ThreadPlanStepInRange::SetAvoidRegexp(const char *name) {
+  auto name_ref = llvm::StringRef::withNullAsEmpty(name);
   if (!m_avoid_regexp_ap)
-    m_avoid_regexp_ap.reset(new RegularExpression(name));
+    m_avoid_regexp_ap.reset(new RegularExpression(name_ref));
 
-  m_avoid_regexp_ap->Compile(name);
+  m_avoid_regexp_ap->Compile(name_ref);
 }
 
 void ThreadPlanStepInRange::SetDefaultFlagValue(uint32_t new_value) {
@@ -361,7 +362,8 @@ bool ThreadPlanStepInRange::FrameMatchesAvoidCriteria() {
             regex_match.GetMatchAtIndex(frame_function_name, 0, match);
             log->Printf("Stepping out of function \"%s\" because it matches "
                         "the avoid regexp \"%s\" - match substring: \"%s\".",
-                        frame_function_name, avoid_regexp_to_use->GetText(),
+                        frame_function_name,
+                        avoid_regexp_to_use->GetText().str().c_str(),
                         match.c_str());
           }
         }