diff options
| author | Francois Pichet <pichet2000@gmail.com> | 2011-07-16 21:17:14 +0000 |
|---|---|---|
| committer | Francois Pichet <pichet2000@gmail.com> | 2011-07-16 21:17:14 +0000 |
| commit | a6c2b3a648913d47703625acb17671dd2d926bbc (patch) | |
| tree | da4f823524b3e582610d9c72fe901e5dd3235aa3 /lib/Frontend/InitHeaderSearch.cpp | |
| parent | 12efd57ee474c06880a7434ece21a39ac3f34e24 (diff) | |
Do not modify string returned by getenv on Windows.
Fixes PR9875, patch by Nikola Smiljanic!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@135356 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Frontend/InitHeaderSearch.cpp')
| -rw-r--r-- | lib/Frontend/InitHeaderSearch.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp index c19e80a5fd..e11a415db1 100644 --- a/lib/Frontend/InitHeaderSearch.cpp +++ b/lib/Frontend/InitHeaderSearch.cpp @@ -420,10 +420,8 @@ static bool getVisualStudioDir(std::string &path) { vscomntools = vs80comntools; if (vscomntools && *vscomntools) { - char *p = const_cast<char *>(strstr(vscomntools, "\\Common7\\Tools")); - if (p) - *p = '\0'; - path = vscomntools; + const char *p = strstr(vscomntools, "\\Common7\\Tools"); + path = p ? std::string(vscomntools, p) : vscomntools; return true; } return false; |