Prevent crash when ScriptingInstance::CompleteInput returns nullptr

1 files changed, 7 insertions, 1 deletions

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);
 }