GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed isValidPathComponent() to detect invalid chars or reserved names.

Browse Source
This commit is contained in:
Vincent Richard 2005-03-28 09:47:34 +00:00
parent 9bc3121e2d
commit 1673ecc41e
1 changed files with 54 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/platforms/windows/windowsFile.cpp
View File

@ -92,7 +92,50 @@ const vmime::string windowsFileSystemFactory::pathToStringImpl(const vmime::util
const bool windowsFileSystemFactory::isValidPathComponent(const vmime::utility::file::path::component& comp) const const bool windowsFileSystemFactory::isValidPathComponent(const vmime::utility::file::path::component& comp) const
{ {
return (comp.getBuffer().find_first_of("\\*") == vmime::string::npos); const string& buffer = comp.getBuffer();
// Check for invalid characters
for (string::size_type i = 0 ; i < buffer.length() ; ++i)
{
const unsigned char c = buffer[i];
switch (c)
{
// Reserved characters
case '<': case '>': case ':':
case '"': case '/': case '\\':
case '|': case '$': case '*':
return false;
default:
if (c <= 31)
return false;
}
}
// Check for reserved names
if (buffer.length() == 3)
{
if (buffer == "CON" || buffer == "PRN" || buffer == "AUX" || buffer == "NUL")
return false;
}
else if (buffer.length() == 4)
{
if (buffer[0] == 'C' && buffer[1] == 'O' && // COM1-COM9
buffer[2] == 'M' && (buffer[3] >= '0' && buffer[3] <= '9'))
{
return false;
}
else if (buffer[0] == 'L' && buffer[1] == 'P' && // LPT1-LPT9
buffer[2] == 'T' && (buffer[3] >= '0' && buffer[3] <= '9'))
{
return false;
}
}
return true;
} }
@ -111,11 +154,11 @@ const bool windowsFileSystemFactory::isValidPath(const vmime::utility::file::pat
void windowsFileSystemFactory::reportError(const vmime::utility::path& path, const int err) void windowsFileSystemFactory::reportError(const vmime::utility::path& path, const int err)
{ {
vmime::string desc; vmime::string desc;
LPVOID lpMsgBuf; LPVOID lpMsgBuf;
if (FormatMessage( if (FormatMessage(
FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, NULL,
err, err,
@ -127,7 +170,7 @@ void windowsFileSystemFactory::reportError(const vmime::utility::path& path, con
desc = (char*)lpMsgBuf; desc = (char*)lpMsgBuf;
LocalFree( lpMsgBuf ); LocalFree( lpMsgBuf );
} }
throw vmime::exceptions::filesystem_exception(desc, path); throw vmime::exceptions::filesystem_exception(desc, path);
} }
@ -188,7 +231,7 @@ const bool windowsFile::canRead() const
CloseHandle(hFile); CloseHandle(hFile);
return true; return true;
} }
const bool windowsFile::canWrite() const const bool windowsFile::canWrite() const
{ {
HANDLE hFile = CreateFile( HANDLE hFile = CreateFile(
@ -217,13 +260,13 @@ const windowsFile::length_type windowsFile::getLength()
NULL); NULL);
if (hFile == INVALID_HANDLE_VALUE) if (hFile == INVALID_HANDLE_VALUE)
windowsFileSystemFactory::reportError(m_path, GetLastError()); windowsFileSystemFactory::reportError(m_path, GetLastError());
DWORD dwSize = GetFileSize(hFile, NULL); DWORD dwSize = GetFileSize(hFile, NULL);
CloseHandle(hFile); CloseHandle(hFile);
return dwSize; return dwSize;
} }
const vmime::utility::path& windowsFile::getFullPath() const const vmime::utility::path& windowsFile::getFullPath() const
{ {
return m_path; return m_path;
@ -313,7 +356,7 @@ const bool windowsFileIterator::hasMoreElements() const
{ {
return m_moreElements; return m_moreElements;
} }
vmime::utility::file* windowsFileIterator::nextElement() vmime::utility::file* windowsFileIterator::nextElement()
{ {
vmime::utility::file* pFile = new windowsFile(m_path / vmime::utility::file::path::component(m_findData.cFileName)); vmime::utility::file* pFile = new windowsFile(m_path / vmime::utility::file::path::component(m_findData.cFileName));
@ -405,7 +448,7 @@ const vmime::utility::stream::size_type windowsFileReaderInputStream::read(value
DWORD dwBytesRead; DWORD dwBytesRead;
if (!ReadFile(m_hFile, (LPVOID)data, (DWORD)count, &dwBytesRead, NULL)) if (!ReadFile(m_hFile, (LPVOID)data, (DWORD)count, &dwBytesRead, NULL))
windowsFileSystemFactory::reportError(m_path, GetLastError()); windowsFileSystemFactory::reportError(m_path, GetLastError());
return dwBytesRead; return dwBytesRead;
} }
const vmime::utility::stream::size_type windowsFileReaderInputStream::skip(const size_type count) const vmime::utility::stream::size_type windowsFileReaderInputStream::skip(const size_type count)