Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-09 05:01:57 +01:00
Code Issues Releases Wiki Activity

Define one constant, PLATFORM_MAX_PATH, for maximum path value, so we don't have to do platform-specific conditionals everywhere we want to check it. In fact, we were actually checking that only for Windows. This is follow-on to Richard's message on audacity-devel about "overflow vulns".

Browse Source 
Remove unnecessary declaration of MAX_PATH in BlockFile.h.
This commit is contained in:
v.audacity
2011-01-06 00:07:59 +00:00
parent 79e1db5ee6
commit 0332c60a2a
8 changed files with 49 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/xml/XMLTagHandler.cpp
View File

@@ -41,7 +41,7 @@ bool XMLValueChecker::IsGoodString(const wxString str)
{
size_t len = str.Length();
int nullIndex = str.Find('\0', false);
if ((len < 2048) && // Shouldn't be any reason for longer strings, except intentional file corruption.
if ((len <= PLATFORM_MAX_PATH) && // Shouldn't be any reason for longer strings, except intentional file corruption.
(nullIndex == -1)) // No null characters except terminator.
return true;
else
@@ -52,14 +52,10 @@ bool XMLValueChecker::IsGoodString(const wxString str)
bool XMLValueChecker::IsGoodFileName(const wxString strFileName, const wxString strDirName /* = "" */)
{
// Test strFileName.
if (!IsGoodFileString(strFileName))
if (!IsGoodFileString(strFileName) ||
(strDirName.Length() + 1 + strFileName.Length() > PLATFORM_MAX_PATH))
return false;
#ifdef _WIN32
if (strFileName.Length() + 1 + strDirName.Length() > MAX_PATH)
return false;
#endif
// Test the corresponding wxFileName.
wxFileName fileName(strDirName, strFileName);
return (fileName.IsOk() && fileName.FileExists());
@@ -83,14 +79,11 @@ bool XMLValueChecker::IsGoodSubdirName(const wxString strSubdirName, const wxStr
// Note this prevents path separators, and relative path to parents (strDirName),
// so fixes vulnerability #3 in the NGS report for UmixIt,
// where an attacker could craft an AUP file with relative pathnames to get to system files, for example.
if (!IsGoodFileString(strSubdirName) || (strSubdirName == wxT(".")) || (strSubdirName == wxT("..")))
if (!IsGoodFileString(strSubdirName) ||
(strSubdirName == wxT(".")) || (strSubdirName == wxT("..")) ||
(strDirName.Length() + 1 + strSubdirName.Length() > PLATFORM_MAX_PATH))
return false;
#ifdef _WIN32
if (strSubdirName.Length() + 1 + strDirName.Length() > MAX_PATH)
return false;
#endif
// Test the corresponding wxFileName.
wxFileName fileName(strDirName, strSubdirName);
return (fileName.IsOk() && fileName.DirExists());
@@ -106,12 +99,8 @@ bool XMLValueChecker::IsGoodPathName(const wxString strPathName)
bool XMLValueChecker::IsGoodPathString(wxString str)
{
return (IsGoodString(str) &&
!str.IsEmpty()
#ifdef _WIN32
&& (str.Length() <= MAX_PATH)
#endif
);
!str.IsEmpty() &&
(str.Length() <= PLATFORM_MAX_PATH));
}