From 9ff9a42902935133868533b9d53ec6ad565e5a10 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Thu, 15 Oct 2015 18:39:31 +0000 Subject: [PATCH] clang-format: Basic escaping when outputting XML. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@250440 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/clang-format/ClangFormat.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/clang-format/ClangFormat.cpp b/tools/clang-format/ClangFormat.cpp index 95b53524ff..1d93497033 100644 --- a/tools/clang-format/ClangFormat.cpp +++ b/tools/clang-format/ClangFormat.cpp @@ -199,9 +199,11 @@ static bool fillRanges(MemoryBuffer *Code, } static void outputReplacementXML(StringRef Text) { + // FIXME: When we sort includes, we need to make sure the stream is correct + // utf-8. size_t From = 0; size_t Index; - while ((Index = Text.find_first_of("\n\r", From)) != StringRef::npos) { + while ((Index = Text.find_first_of("\n\r<&", From)) != StringRef::npos) { llvm::outs() << Text.substr(From, Index - From); switch (Text[Index]) { case '\n': @@ -210,6 +212,12 @@ static void outputReplacementXML(StringRef Text) { case '\r': llvm::outs() << " "; break; + case '<': + llvm::outs() << "<"; + break; + case '&': + llvm::outs() << "&"; + break; default: llvm_unreachable("Unexpected character encountered!"); } -- 2.40.0