maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

System-Win32/Path: Fix incorrect assumption in isValid. 

A recent commit to clang exposed a bug in the Win32 Path code. This is a
minimal fix for it.

llvm-svn: 116925
This commit is contained in:
Michael J. Spencer 2010-10-20 15:23:58 +00:00
parent ee8c0051d3
commit 9748310eab
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/lib/System/Win32/Path.inc
View File

@ -64,6 +64,13 @@ Path::operator=(StringRef that) {
return *this;
}
// push_back 0 on create, and pop_back on delete.
struct ScopedNullTerminator {
std::string &str;
ScopedNullTerminator(std::string &s) : str(s) { str.push_back(0); }
~ScopedNullTerminator() { str.pop_back(); }
};
bool
Path::isValid() const {
if (path.empty())
@ -72,6 +79,8 @@ Path::isValid() const {
// If there is a colon, it must be the second character, preceded by a letter
// and followed by something.
size_t len = path.size();
// This code assumes that path is null terminated, so make sure it is.
ScopedNullTerminator snt(path);
size_t pos = path.rfind(':',len);
size_t rootslash = 0;
if (pos != std::string::npos) {