commit ee99c8191cc0d9778d733da51be2f52c7b732d76
author Chad Rosier <mcrosier@apple.com> Fri Aug 26 21:47:20 2011 +0000
committer Chad Rosier <mcrosier@apple.com> Fri Aug 26 21:47:20 2011 +0000
tree 812f230f4043b2b01511ea669907473e456bc9ea
parent fe87fc73c0091a8d6ba04b7e3b5f144d4a0517a3

Make sure the std::string isn't deallocated prior to use.  Many thanks to Eli
for catching this.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@138666 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Driver/Driver.cpp

diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index acdfdc2..66d2df1 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -1336,12 +1336,12 @@
 }
 
 // Strip the directory and suffix from BaseInput.
-static const char *getBaseName (const char *BaseInput) {
+static std::string getBaseName (const char *BaseInput) {
   std::pair<StringRef, StringRef> Split = StringRef(BaseInput).rsplit('/');
   if (Split.second != "")
-    return Split.second.split('.').first.str().c_str();
+    return Split.second.split('.').first.str();
   else
-    return Split.first.split('.').first.str().c_str();
+    return Split.first.split('.').first.str();
 }
 
 const char *Driver::GetNamedOutputPath(Compilation &C,
@@ -1364,7 +1364,7 @@
   if ((!AtTopLevel && !C.getArgs().hasArg(options::OPT_save_temps)) ||
       CCGenDiagnostics) {
     std::string TmpName =
-      GetTemporaryPath(getBaseName(BaseInput), 
+      GetTemporaryPath(getBaseName(BaseInput).c_str(), 
                        types::getTypeTempSuffix(JA.getType()));
     return C.addTempFile(C.getArgs().MakeArgString(TmpName.c_str()));
   }
@@ -1400,7 +1400,7 @@
   if (!AtTopLevel && C.getArgs().hasArg(options::OPT_save_temps) &&
       NamedOutput == BaseName) {
     std::string TmpName =
-      GetTemporaryPath(getBaseName(BaseInput),
+      GetTemporaryPath(getBaseName(BaseInput).c_str(),
                        types::getTypeTempSuffix(JA.getType()));
     return C.addTempFile(C.getArgs().MakeArgString(TmpName.c_str()));
   }