diff options
| author | Chad Rosier <mcrosier@apple.com> | 2011-08-26 21:47:20 +0000 |
|---|---|---|
| committer | Chad Rosier <mcrosier@apple.com> | 2011-08-26 21:47:20 +0000 |
| commit | ee99c8191cc0d9778d733da51be2f52c7b732d76 (patch) | |
| tree | 812f230f4043b2b01511ea669907473e456bc9ea /lib/Driver/Driver.cpp | |
| parent | fe87fc73c0091a8d6ba04b7e3b5f144d4a0517a3 (diff) | |
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
Diffstat (limited to 'lib/Driver/Driver.cpp')
| -rw-r--r-- | lib/Driver/Driver.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index acdfdc21a2..66d2df16e1 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -1336,12 +1336,12 @@ void Driver::BuildJobsForAction(Compilation &C, } // 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 @@ const char *Driver::GetNamedOutputPath(Compilation &C, 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 @@ const char *Driver::GetNamedOutputPath(Compilation &C, 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())); } |