[cfe-commits] r68805 - in /cfe/trunk: lib/Driver/Driver.cpp tools/driver/driver.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Fri Apr 10 13:32:59 2009
New Revision: 68805

URL: http://llvm.org/viewvc/llvm-project?rev=68805&view=rev
Log:
Driver: CCC_ADD_ARGS could end up using dangling pointers.

Modified:
    cfe/trunk/lib/Driver/Driver.cpp
    cfe/trunk/tools/driver/driver.cpp

Modified: cfe/trunk/lib/Driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=68805&r1=68804&r2=68805&view=diff

==============================================================================
--- cfe/trunk/lib/Driver/Driver.cpp (original)
+++ cfe/trunk/lib/Driver/Driver.cpp Fri Apr 10 13:32:59 2009
@@ -109,8 +109,6 @@
 
   // FIXME: What are we going to do with -V and -b?
 
-  // FIXME: Handle CCC_ADD_ARGS.
-
   // FIXME: This stuff needs to go into the Compilation, not the
   // driver.
   bool CCCPrintOptions = false, CCCPrintActions = false;

Modified: cfe/trunk/tools/driver/driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/driver.cpp?rev=68805&r1=68804&r2=68805&view=diff

==============================================================================
--- cfe/trunk/tools/driver/driver.cpp (original)
+++ cfe/trunk/tools/driver/driver.cpp Fri Apr 10 13:32:59 2009
@@ -86,8 +86,8 @@
   llvm::OwningPtr<Compilation> C;
 
   // Handle CCC_ADD_ARGS, a comma separated list of extra arguments.
+  std::set<std::string> SavedStrings;
   if (const char *Cur = ::getenv("CCC_ADD_ARGS")) {
-    std::set<std::string> SavedStrings;
     std::vector<const char*> StringPointers;
 
     // FIXME: Driver shouldn't take extra initial argument.