properly escape filenames when generating implicit #includes, this handles
things like " in paths etc. Found by inspection.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68632 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/clang-cc/clang-cc.cpp b/tools/clang-cc/clang-cc.cpp
index d5c44cd..ee90147 100644
--- a/tools/clang-cc/clang-cc.cpp
+++ b/tools/clang-cc/clang-cc.cpp
@@ -1011,7 +1011,10 @@
static void AddImplicitInclude(std::vector<char> &Buf, const std::string &File){
const char *Inc = "#include \"";
Buf.insert(Buf.end(), Inc, Inc+strlen(Inc));
- Buf.insert(Buf.end(), File.begin(), File.end());
+
+ // Escape double quotes etc.
+ std::string EscapedFile = Lexer::Stringify(File);
+ Buf.insert(Buf.end(), EscapedFile.begin(), EscapedFile.end());
Buf.push_back('"');
Buf.push_back('\n');
}
@@ -1020,7 +1023,10 @@
const std::string &File) {
const char *Inc = "#__include_macros \"";
Buf.insert(Buf.end(), Inc, Inc+strlen(Inc));
- Buf.insert(Buf.end(), File.begin(), File.end());
+
+ // Escape double quotes etc.
+ std::string EscapedFile = Lexer::Stringify(File);
+ Buf.insert(Buf.end(), EscapedFile.begin(), EscapedFile.end());
Buf.push_back('"');
Buf.push_back('\n');
}