fix #442 - Prevent crash when cursor is in the middle of a UTF sequence

dlang-community · Feb 24, 2018 · 7e70c26 · 7e70c26
1 parent d6ce0a2
commit 7e70c26
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/src/dcd/server/autocomplete/complete.d b/src/dcd/server/autocomplete/complete.d
@@ -114,8 +114,15 @@ AutocompleteResponse dotCompletion(T)(T beforeTokens, const(Token)[] tokenArray,
 		// of at the end
 		auto t = beforeTokens[$ - 1];
 		if (cursorPosition - t.index >= 0 && cursorPosition - t.index <= t.text.length)
+		{
 			partial = t.text[0 .. cursorPosition - t.index];
-		significantTokenType = tok!"identifier";
+			// issue 442 - prevent `partial` to start in the middle of a MBC
+			// since later there's a non-nothrow call to `toUpper`
+			import std.utf : validate, UTFException;
+			try validate(partial);
+			catch (UTFException) partial = "";
+		}
+		significantTokenType = partial.length ? tok!"identifier" : tok!"";
 		beforeTokens = beforeTokens[0 .. $ - 1];
 	}
 	else if (beforeTokens.length >= 2 && beforeTokens[$ - 1] == tok!".")

diff --git a/tests/tc_middle_of_utf/expected1.txt b/tests/tc_middle_of_utf/expected1.txt
diff --git a/tests/tc_middle_of_utf/file.d b/tests/tc_middle_of_utf/file.d
@@ -0,0 +1 @@
+ß
diff --git a/tests/tc_middle_of_utf/run.sh b/tests/tc_middle_of_utf/run.sh
@@ -0,0 +1,5 @@
+set -e
+set -u
+
+../../bin/dcd-client $1 file.d -c1 > actual1.txt
+diff actual1.txt expected1.txt