Bug 1641598 - Fix defect in Key::LengthOfEncodedBinary. r=dom-workers-and-storage-reviewers,ttung

Differential Revision: https://phabricator.services.mozilla.com/D78696
This commit is contained in:
Simon Giesecke
2020-06-29 14:36:51 +00:00
parent dc02e8ecc0
commit 99823d5a76

View File

@@ -128,8 +128,18 @@ IDBResult<void, IDBSpecialValue::Invalid> Key::SetFromString(
uint32_t Key::LengthOfEncodedBinary(const EncodedDataType* aPos,
const EncodedDataType* aEnd) {
MOZ_ASSERT(*aPos % Key::eMaxType == Key::eBinary, "Don't call me!");
const EncodedDataType* encodedSectionEnd;
return CalcDecodedStringySize<uint8_t>(aPos + 1, aEnd, &encodedSectionEnd);
const auto* iter = aPos + 1;
for (; iter < aEnd && *iter != eTerminator; ++iter) {
if (*iter & 0x80) {
++iter;
// XXX if iter == aEnd now, we got a bad enconding, should we report that
// also in non-debug builds?
MOZ_ASSERT(iter < aEnd);
}
}
return iter - aPos - 1;
}
IDBResult<void, IDBSpecialValue::Invalid> Key::ToLocaleAwareKey(