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 | 8e122b9fca446ae0581ea9ef819036304bef290c (patch) | |
| tree | b997ca62d8c2a2fa20e202bc34edf2acafa91ae8 /clang/lib/Frontend | |
| parent | dc7d3c121b93cd8d51c5efdc3cd576959d00ccab (diff) | |
| download | bcm5719-llvm-8e122b9fca446ae0581ea9ef819036304bef290c.tar.gz bcm5719-llvm-8e122b9fca446ae0581ea9ef819036304bef290c.zip | |
Do not modify string returned by getenv on Windows.
Fixes PR9875, patch by Nikola Smiljanic!
llvm-svn: 135356
Diffstat (limited to 'clang/lib/Frontend')
| -rw-r--r-- | clang/lib/Frontend/InitHeaderSearch.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/clang/lib/Frontend/InitHeaderSearch.cpp b/clang/lib/Frontend/InitHeaderSearch.cpp index c19e80a5fdd..e11a415db19 100644 --- a/clang/lib/Frontend/InitHeaderSearch.cpp +++ b/clang/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; |
