From dbb5c9d47b3db0a478aab57b9ef43d0dd3f6d4b5 Mon Sep 17 00:00:00 2001 From: Josh F Date: Thu, 28 Apr 2022 18:58:01 -0400 Subject: Fix lifetimes in ScriptingInstance::CompleteInputCallback --- scriptingprovider.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scriptingprovider.cpp') diff --git a/scriptingprovider.cpp b/scriptingprovider.cpp index d2a3fb9f..8b86bbc3 100644 --- a/scriptingprovider.cpp +++ b/scriptingprovider.cpp @@ -129,13 +129,13 @@ void ScriptingInstance::SetCurrentSelectionCallback(void* ctxt, uint64_t begin, char* ScriptingInstance::CompleteInputCallback(void* ctxt, const char* text, uint64_t state) { ScriptingInstance* instance = (ScriptingInstance*)ctxt; - const char* completed = instance->CompleteInput(text, state).c_str(); - if (completed == nullptr) + std::string completed = instance->CompleteInput(text, state); + if (completed.c_str() == nullptr) { LogWarn("ScriptingInstance::CompleteInput returned nullptr; replacing with empty string."); completed = ""; } - return BNAllocString(completed); + return BNAllocString(completed.c_str()); } -- cgit v1.3.1