Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 688882 - Investigate stack buffer overflow in nsLocalFile::EnsureShortPath. r=bsmedberg

Browse Source
This commit is contained in:
Brian R. Bondy 2011-09-29 09:06:27 -04:00
parent fc7ee15ecc
commit 245f552d39
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xpcom/io/nsLocalFileWin.cpp
View File

@ -3105,12 +3105,14 @@ nsLocalFile::EnsureShortPath()
if (!mShortWorkingPath.IsEmpty())
return;
WCHAR thisshort[MAX_PATH];
DWORD thisr = ::GetShortPathNameW(mWorkingPath.get(), thisshort,
sizeof(thisshort));
// If an error occurred (thisr == 0) thisshort is uninitialized memory!
if (thisr != 0 && thisr < sizeof(thisshort))
mShortWorkingPath.Assign(thisshort);
WCHAR shortPath[MAX_PATH + 1];
DWORD lengthNeeded = ::GetShortPathNameW(mWorkingPath.get(), shortPath,
NS_ARRAY_LENGTH(shortPath));
// If an error occurred then lengthNeeded is set to 0 or the length of the
// needed buffer including NULL termination. If it succeeds the number of
// wide characters not including NULL termination is returned.
if (lengthNeeded != 0 && lengthNeeded < NS_ARRAY_LENGTH(shortPath))
mShortWorkingPath.Assign(shortPath);
else
mShortWorkingPath.Assign(mWorkingPath);
}