Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 02:57:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1000079 - Don't let Windows overwrite length 0 strings. r=bsmedberg

Browse Source
This commit is contained in:
James Kitchener 2014-04-24 01:03:00 +02:00
parent 715b91be72
commit 02f9fb48d5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
toolkit/xre/nsXREDirProvider.cpp
View File

@ -931,8 +931,8 @@ GetRegWindowsAppDataFolder(bool aLocal, nsAString& _retval)
return NS_ERROR_NOT_AVAILABLE;
}
// |size| includes room for the terminating null character
DWORD resultLen = size / 2 - 1;
// |size| may or may not include room for the terminating null character
DWORD resultLen = size / 2;
_retval.SetLength(resultLen);
nsAString::iterator begin;
@ -951,6 +951,11 @@ GetRegWindowsAppDataFolder(bool aLocal, nsAString& _retval)
return NS_ERROR_NOT_AVAILABLE;
}
if (!_retval.CharAt(resultLen - 1)) {
// It was already null terminated.
_retval.Truncate(resultLen - 1);
}
return NS_OK;
}