PR13312: Don't crash when printing a fixit that ends in a unicode character.
llvm-svn: 160112
diff --git a/clang/lib/Frontend/TextDiagnostic.cpp b/clang/lib/Frontend/TextDiagnostic.cpp
index ae13966..306306d 100644
--- a/clang/lib/Frontend/TextDiagnostic.cpp
+++ b/clang/lib/Frontend/TextDiagnostic.cpp
@@ -1160,8 +1160,13 @@
unsigned LastColumnModified
= HintColNo + I->CodeToInsert.size();
- if (LastColumnModified <= static_cast<unsigned>(map.bytes()))
+ if (LastColumnModified <= static_cast<unsigned>(map.bytes())) {
+ // If we're right in the middle of a multibyte character skip to
+ // the end of it.
+ while (map.byteToColumn(LastColumnModified) == -1)
+ ++LastColumnModified;
LastColumnModified = map.byteToColumn(LastColumnModified);
+ }
if (LastColumnModified > FixItInsertionLine.size())
FixItInsertionLine.resize(LastColumnModified, ' ');