From a2f10504716992c63cb74e016c205d7a3f03d347 Mon Sep 17 00:00:00 2001 From: Josh F Date: Mon, 11 Apr 2022 19:22:18 -0400 Subject: Prevent crash when ScriptingInstance::CompleteInput returns nullptr --- scriptingprovider.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'scriptingprovider.cpp') diff --git a/scriptingprovider.cpp b/scriptingprovider.cpp index 9e85e91d..d2a3fb9f 100644 --- a/scriptingprovider.cpp +++ b/scriptingprovider.cpp @@ -129,7 +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; - return BNAllocString(instance->CompleteInput(text, state).c_str()); + const char* completed = instance->CompleteInput(text, state).c_str(); + if (completed == nullptr) + { + LogWarn("ScriptingInstance::CompleteInput returned nullptr; replacing with empty string."); + completed = ""; + } + return BNAllocString(completed); } -- cgit v1.3.1