Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-03 10:00:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix misuse of std::string in assuming that it's always null terminated, and that

Browse source 
the c_str result is writable.  

svn path=/trunk/; revision=39218
This commit is contained in:
Art Yerkes 2009-01-31 08:43:10 +00:00
parent 7059620a5e
commit 37866eb8f9
2 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
reactos/tools/xml.cpp
View file

@ -58,6 +58,35 @@ static const char* WSEQ = " =\t\r\n";
string working_directory;
std::vector<char> vectorize(const std::string &str)
{
std::vector<char> result( str.size() + 1 );
strcpy( &result[0], str.c_str() );
return result;
}
void vectappend(std::vector<char> &strvec, const char *str)
{
if (*str) { strvec[strlen(&strvec[0])] = *str; str++; }
while (*str)
{
strvec.push_back(*str);
str++;
}
strvec.push_back(0);
}
void vectappend(std::vector<char> &strvec, const std::string &str)
{
vectappend(strvec, str.c_str());
}
void vectappend(std::vector<char> &strvec, char ch)
{
strvec[strlen(&strvec[0])] = ch;
strvec.push_back(0);
}
XMLException::XMLException (
const std::string& location,
const char* format, ... )
@ -158,7 +187,7 @@ Path::Fixup ( const string& file, bool include_filename ) const
return file;
}
vector<string> pathtmp ( path );
string tmp ( file );
vector<char> tmp = vectorize( file );
const char* prev = strtok ( &tmp[0], "/\\" );
const char* p = strtok ( NULL, "/\\" );
while ( p )
@ -184,18 +213,18 @@ Path::Fixup ( const string& file, bool include_filename ) const
pathtmp.push_back ( prev );
// reuse tmp variable to return recombined path
tmp.resize(0);
tmp = vectorize("");
for ( size_t i = 0; i < pathtmp.size(); i++ )
{
// this squirreliness is b/c win32 has drive letters and *nix doesn't...
#ifdef WIN32
if ( i ) tmp += "/";
if ( i ) vectappend(tmp, "/");
#else
tmp += "/";
vectappend(tmp, "/");
#endif
tmp += pathtmp[i];
vectappend(tmp, pathtmp[i]);
}
return tmp;
return &tmp[0];
}
string

5
reactos/tools/xml.h
View file

@ -236,4 +236,9 @@ XMLLoadFile (
XMLElement*
XMLLoadFile ( const std::string& filename );
std::vector<char> vectorize(const std::string &str);
void vectappend(std::vector<char> &strvec, char ch);
void vectappend(std::vector<char> &strvec, const char *charstr);
void vectappend(std::vector<char> &strvec, const std::string &str);
#endif // XML_H