Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1171603 - Better size check in nsTSubstring::ReplacePrep. r=ehsan

Browse Source 
--HG--
extra : rebase_source : a42342c8f82cb00e1e1b9b9673fc1e290fb9cf23
This commit is contained in:
Andrea Marchesini 2015-07-06 14:27:35 -04:00
parent db3a3881cf
commit b6e7f5efcf
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xpcom/string/nsTSubstring.cpp
View File

@ -4,6 +4,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/CheckedInt.h"
#include "mozilla/double-conversion.h"
#include "mozilla/MemoryReporting.h"
@ -160,6 +161,31 @@ nsTSubstring_CharT::Finalize()
// mData, mLength, and mFlags are purposefully left dangling
}
bool
nsTSubstring_CharT::ReplacePrep(index_type aCutStart,
size_type aCutLength,
size_type aNewLength)
{
aCutLength = XPCOM_MIN(aCutLength, mLength - aCutStart);
mozilla::CheckedInt<size_type> newTotalLen = mLength;
newTotalLen += aNewLength;
newTotalLen -= aCutLength;
if (!newTotalLen.isValid()) {
return false;
}
if (aCutStart == mLength && Capacity() > newTotalLen.value()) {
mFlags &= ~F_VOIDED;
mData[newTotalLen.value()] = char_type(0);
mLength = newTotalLen.value();
return true;
}
return ReplacePrepInternal(aCutStart, aCutLength, aNewLength,
newTotalLen.value());
}
bool
nsTSubstring_CharT::ReplacePrepInternal(index_type aCutStart, size_type aCutLen,
size_type aFragLen, size_type aNewLen)

13
xpcom/string/nsTSubstring.h
View File

@ -997,18 +997,7 @@ protected:
*/
MOZ_WARN_UNUSED_RESULT bool ReplacePrep(index_type aCutStart,
size_type aCutLength,
size_type aNewLength)
{
aCutLength = XPCOM_MIN(aCutLength, mLength - aCutStart);
uint32_t newTotalLen = mLength - aCutLength + aNewLength;
if (aCutStart == mLength && Capacity() > newTotalLen) {
mFlags &= ~F_VOIDED;
mData[newTotalLen] = char_type(0);
mLength = newTotalLen;
return true;
}
return ReplacePrepInternal(aCutStart, aCutLength, aNewLength, newTotalLen);
}
size_type aNewLength);
MOZ_WARN_UNUSED_RESULT bool NS_FASTCALL ReplacePrepInternal(
index_type aCutStart,