livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/maint-a' of https://github.com/secondlife/viewer

meow-7.2.2
Ansariel 2024-06-21 20:41:38 +02:00
parent fa20e5ce3b 7342ebf43a
commit 31b70d0abb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llfilesystem/lldir.cpp
View File

@ -941,15 +941,15 @@ std::string LLDir::getTempFilename() const
}
// static
std::string LLDir::getScrubbedFileName(const std::string uncleanFileName)
std::string LLDir::getScrubbedFileName(std::string_view uncleanFileName)
{
std::string name(uncleanFileName);
const std::string illegalChars(getForbiddenFileChars());
// replace any illegal file chars with and underscore '_'
for( unsigned int i = 0; i < illegalChars.length(); i++ )
for (const char& ch : illegalChars)
{
std::string::size_type j = -1;
while((j = name.find(illegalChars[i])) > std::string::npos)
std::string::size_type j{ 0 };
while ((j = name.find(ch, j)) != std::string::npos)
{
name[j] = '_';
}

2
indra/llfilesystem/lldir.h
View File

@ -222,7 +222,7 @@ class LLDir
static std::string getDumpLogsDirPath(const std::string &file_name = "");
// For producing safe download file names from potentially unsafe ones
static std::string getScrubbedFileName(const std::string uncleanFileName);
static std::string getScrubbedFileName(std::string_view uncleanFileName);
static std::string getForbiddenFileChars();
void setDumpDir( const std::string& path );