corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1445260 - Add release-mode checks to Vector's operator[], back() and popBack(). a=pascalc

Browse Source 
Also, while I am touching this file, change some typedefs to using.

Original Revision: https://phabricator.services.mozilla.com/D266670

Differential Revision: https://phabricator.services.mozilla.com/D269446
This commit is contained in:
Andrew McCreight
2025-10-28 17:08:06 +00:00
committed by pchevrel@mozilla.com
parent 0f106aafc1
commit 3342eff1d0
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mfbt/Vector.h
View File

@@ -343,8 +343,8 @@ class MOZ_NON_PARAM MOZ_GSL_OWNER Vector final : private AllocPolicy {
/* utilities */ /* utilities */
static constexpr bool kElemIsPod = static constexpr bool kElemIsPod =
std::is_trivial_v<T> && std::is_standard_layout_v<T>; std::is_trivial_v<T> && std::is_standard_layout_v<T>;
typedef detail::VectorImpl<T, MinInlineCapacity, AllocPolicy, kElemIsPod> using Impl =
Impl; detail::VectorImpl<T, MinInlineCapacity, AllocPolicy, kElemIsPod>;
friend struct detail::VectorImpl<T, MinInlineCapacity, AllocPolicy, friend struct detail::VectorImpl<T, MinInlineCapacity, AllocPolicy,
kElemIsPod>; kElemIsPod>;
@@ -537,7 +537,7 @@ class MOZ_NON_PARAM MOZ_GSL_OWNER Vector final : private AllocPolicy {
public: public:
static const size_t sMaxInlineStorage = MinInlineCapacity; static const size_t sMaxInlineStorage = MinInlineCapacity;
typedef T ElementType; using ElementType = T;
explicit Vector(AllocPolicy); explicit Vector(AllocPolicy);
Vector() : Vector(AllocPolicy()) {} Vector() : Vector(AllocPolicy()) {}
@@ -582,25 +582,33 @@ class MOZ_NON_PARAM MOZ_GSL_OWNER Vector final : private AllocPolicy {
T& operator[](size_t aIndex) { T& operator[](size_t aIndex) {
MOZ_ASSERT(!mEntered); MOZ_ASSERT(!mEntered);
MOZ_ASSERT(aIndex < mLength); if (MOZ_UNLIKELY(aIndex >= mLength)) {
mozilla::detail::InvalidArrayIndex_CRASH(aIndex, mLength);
}
return begin()[aIndex]; return begin()[aIndex];
} }
const T& operator[](size_t aIndex) const { const T& operator[](size_t aIndex) const {
MOZ_ASSERT(!mEntered); MOZ_ASSERT(!mEntered);
MOZ_ASSERT(aIndex < mLength); if (MOZ_UNLIKELY(aIndex >= mLength)) {
mozilla::detail::InvalidArrayIndex_CRASH(aIndex, mLength);
}
return begin()[aIndex]; return begin()[aIndex];
} }
T& back() { T& back() {
MOZ_ASSERT(!mEntered); MOZ_ASSERT(!mEntered);
MOZ_ASSERT(!empty()); if (MOZ_UNLIKELY(empty())) {
mozilla::detail::InvalidArrayIndex_CRASH(0, 0);
}
return *(end() - 1); return *(end() - 1);
} }
const T& back() const { const T& back() const {
MOZ_ASSERT(!mEntered); MOZ_ASSERT(!mEntered);
MOZ_ASSERT(!empty()); if (MOZ_UNLIKELY(empty())) {
mozilla::detail::InvalidArrayIndex_CRASH(0, 0);
}
return *(end() - 1); return *(end() - 1);
} }
@@ -1519,7 +1527,9 @@ MOZ_ALWAYS_INLINE bool Vector<T, N, AP>::append(const U* aInsBegin,
template <typename T, size_t N, class AP> template <typename T, size_t N, class AP>
MOZ_ALWAYS_INLINE void Vector<T, N, AP>::popBack() { MOZ_ALWAYS_INLINE void Vector<T, N, AP>::popBack() {
MOZ_REENTRANCY_GUARD_ET_AL; MOZ_REENTRANCY_GUARD_ET_AL;
MOZ_ASSERT(!empty()); if (MOZ_UNLIKELY(empty())) {
mozilla::detail::InvalidArrayIndex_CRASH(0, 0);
}
--mLength; --mLength;
endNoCheck()->~T(); endNoCheck()->~T();
} }