[cfe-commits] r68632 - /cfe/trunk/tools/clang-cc/clang-cc.cpp

[Chris Lattner]

Author: lattner
Date: Wed Apr  8 15:10:57 2009
New Revision: 68632

URL: http://llvm.org/viewvc/llvm-project?rev=68632&view=rev
Log:
properly escape filenames when generating implicit #includes, this handles
things like " in paths etc.  Found by inspection.

Modified:
    cfe/trunk/tools/clang-cc/clang-cc.cpp

Modified: cfe/trunk/tools/clang-cc/clang-cc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-cc/clang-cc.cpp?rev=68632&r1=68631&r2=68632&view=diff

==============================================================================
--- cfe/trunk/tools/clang-cc/clang-cc.cpp (original)
+++ cfe/trunk/tools/clang-cc/clang-cc.cpp Wed Apr  8 15:10:57 2009
@@ -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');
 }