kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix-FileIsDirectory-SEGV' into release

This commit is contained in:
Brad King 2013-05-31 09:37:10 -04:00
parent 0ad0c37206 045d6ae0b0
commit aad04efe5e
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/kwsys/SystemTools.cxx
View File

@ -2742,14 +2742,23 @@ bool SystemTools::FileIsDirectory(const char* name)
} }
// Remove any trailing slash from the name. // Remove any trailing slash from the name.
char buffer[KWSYS_SYSTEMTOOLS_MAXPATH]; char local_buffer[KWSYS_SYSTEMTOOLS_MAXPATH];
std::string string_buffer;
size_t last = length-1; size_t last = length-1;
if(last > 0 && (name[last] == '/' || name[last] == '\\') if(last > 0 && (name[last] == '/' || name[last] == '\\')
&& strcmp(name, "/") !=0) && strcmp(name, "/") !=0)
{ {
memcpy(buffer, name, last); if(last < sizeof(local_buffer))
buffer[last] = 0; {
name = buffer; memcpy(local_buffer, name, last);
local_buffer[last] = 0;
name = local_buffer;
}
else
{
string_buffer.append(name, last);
name = string_buffer.c_str();
}
} }
// Now check the file node type. // Now check the file node type.