diff options
| -rw-r--r-- | lldb/test/tools/lldb-mi/TestMiSyntax.py | 1 | ||||
| -rw-r--r-- | lldb/tools/lldb-mi/MICmdArgValFile.cpp | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lldb/test/tools/lldb-mi/TestMiSyntax.py b/lldb/test/tools/lldb-mi/TestMiSyntax.py index 51a02aea0f6..9f3e32c84c0 100644 --- a/lldb/test/tools/lldb-mi/TestMiSyntax.py +++ b/lldb/test/tools/lldb-mi/TestMiSyntax.py @@ -36,7 +36,6 @@ class MiSyntaxTestCase(lldbmi_testcase.MiTestCaseBase): @lldbmi_test @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows") - @unittest2.skip("lldb-mi doesn't handle special chars properly") def test_lldbmi_specialchars(self): """Test that 'lldb-mi --interpreter' handles complicated strings.""" diff --git a/lldb/tools/lldb-mi/MICmdArgValFile.cpp b/lldb/tools/lldb-mi/MICmdArgValFile.cpp index cee811f24de..591ee9b358c 100644 --- a/lldb/tools/lldb-mi/MICmdArgValFile.cpp +++ b/lldb/tools/lldb-mi/MICmdArgValFile.cpp @@ -193,13 +193,14 @@ CMICmdArgValFile::IsFilePath(const CMIUtilString &vrFileNamePath) const bool CMICmdArgValFile::IsValidChars(const CMIUtilString &vrText) const { + static CMIUtilString s_strSpecialCharacters(".'\"`@#$%^&*()_+-={}[]| "); const MIchar *pPtr = const_cast<MIchar *>(vrText.c_str()); for (MIuint i = 0; i < vrText.length(); i++, pPtr++) { const MIchar c = *pPtr; if (::isalnum((int)c) == 0) { - if ((c != '.') && (c != '-') && (c != '_')) + if (s_strSpecialCharacters.find(c) == CMIUtilString::npos) return false; } } |
