From 5024fc06905476d9bf49c28350ae9fef83953519 Mon Sep 17 00:00:00 2001 From: David Shah Date: Fri, 24 Apr 2020 16:41:13 +0100 Subject: python: Escape strings for autocomplete Signed-off-by: David Shah --- 3rdparty/python-console/modified/pyinterpreter.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/3rdparty/python-console/modified/pyinterpreter.cc b/3rdparty/python-console/modified/pyinterpreter.cc index 89c9b88c..958049b9 100644 --- a/3rdparty/python-console/modified/pyinterpreter.cc +++ b/3rdparty/python-console/modified/pyinterpreter.cc @@ -82,7 +82,13 @@ const std::list &pyinterpreter_suggest(const std::string &hint) PyEval_AcquireThread(m_threadState); m_suggestions.clear(); int i = 0; - std::string command = string_format("sys.completer.complete('%s', %d)\n", hint.c_str(), i); + std::string escaped; + for (char c : hint) { + if (c == '\'' || c == '\\') + escaped += '\\'; + escaped += c; + } + std::string command = string_format("sys.completer.complete('%s', %d)\n", escaped.c_str(), i); std::string res; do { PyObject *py_result; @@ -94,7 +100,7 @@ const std::list &pyinterpreter_suggest(const std::string &hint) res = redirector_take_output(m_threadState); ++i; - command = string_format("sys.completer.complete('%s', %d)\n", hint.c_str(), i); + command = string_format("sys.completer.complete('%s', %d)\n", escaped.c_str(), i); if (res.size()) { // throw away the newline res = res.substr(1, res.size() - 3); -- cgit v1.2.3