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

Bug 1947437 - Fix the nullptr assignment on CheckedUnsafePtr. r=dom-worker-reviewers,asuth,smaug

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D235952
This commit is contained in:
Eden Chuang
2025-02-12 08:58:00 +00:00
parent 234eab4e05
commit 5d192f4a2e
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dom/quota/CheckedUnsafePtr.h
View File

@@ -289,11 +289,17 @@ class CheckedUnsafePtrBase<T, CheckingSupport::Enabled>
CheckedUnsafePtrBase& operator=(const CheckedUnsafePtrBase& aOther) { CheckedUnsafePtrBase& operator=(const CheckedUnsafePtrBase& aOther) {
if (StaticPrefs::dom_checkedUnsafePtr_dumpStacks_enabled()) { if (StaticPrefs::dom_checkedUnsafePtr_dumpStacks_enabled()) {
mLastAssignmentStack.Truncate(); mLastAssignmentStack.Truncate();
MozStackWalk(CheckedUnsafePtrStackCallback, CallerPC(), 0, if (aOther.get()) {
&mLastAssignmentStack); MozStackWalk(CheckedUnsafePtrStackCallback, CallerPC(), 0,
&mLastAssignmentStack);
}
} }
if (&aOther != this) { if (&aOther != this) {
Replace(aOther.Downcast()); if (aOther.get()) {
Replace(aOther.Downcast());
} else {
Reset();
}
} }
return Downcast(); return Downcast();
} }

23
dom/quota/test/gtest/TestCheckedUnsafePtr.cpp
View File

@@ -56,7 +56,9 @@ class CheckedUnsafePtrTest : public ::testing::Test {
}; };
TEST_F(CheckedUnsafePtrTest, PointeeWithNoCheckedUnsafePtrs) { TEST_F(CheckedUnsafePtrTest, PointeeWithNoCheckedUnsafePtrs) {
{ DerivedPointee pointee{mPassedCheck}; } {
DerivedPointee pointee{mPassedCheck};
}
ASSERT_TRUE(mPassedCheck); ASSERT_TRUE(mPassedCheck);
} }
@@ -92,6 +94,23 @@ TYPED_TEST_P(TypedCheckedUnsafePtrTest, CheckedUnsafePtrCopyAssigned) {
ASSERT_TRUE(this->mPassedCheck); ASSERT_TRUE(this->mPassedCheck);
} }
TYPED_TEST_P(TypedCheckedUnsafePtrTest, CheckedUnsafePtrNullptrAssigned) {
{
CheckedUnsafePtr<TypeParam> ptr = nullptr;
}
ASSERT_TRUE(this->mPassedCheck);
}
TYPED_TEST_P(TypedCheckedUnsafePtrTest,
CheckedUnsafePtrNullCheckedUnsafePtrAssigned) {
{
CheckedUnsafePtr<TypeParam> ptr1(nullptr);
CheckedUnsafePtr<TypeParam> ptr2;
ptr2 = ptr1;
}
ASSERT_TRUE(this->mPassedCheck);
}
TYPED_TEST_P(TypedCheckedUnsafePtrTest, TYPED_TEST_P(TypedCheckedUnsafePtrTest,
PointeeWithOneDanglingCheckedUnsafePtr) { PointeeWithOneDanglingCheckedUnsafePtr) {
[this]() -> CheckedUnsafePtr<TypeParam> { [this]() -> CheckedUnsafePtr<TypeParam> {
@@ -136,6 +155,8 @@ REGISTER_TYPED_TEST_SUITE_P(TypedCheckedUnsafePtrTest,
PointeeWithOneCheckedUnsafePtr, PointeeWithOneCheckedUnsafePtr,
CheckedUnsafePtrCopyConstructed, CheckedUnsafePtrCopyConstructed,
CheckedUnsafePtrCopyAssigned, CheckedUnsafePtrCopyAssigned,
CheckedUnsafePtrNullptrAssigned,
CheckedUnsafePtrNullCheckedUnsafePtrAssigned,
PointeeWithOneDanglingCheckedUnsafePtr, PointeeWithOneDanglingCheckedUnsafePtr,
PointeeWithOneCopiedDanglingCheckedUnsafePtr, PointeeWithOneCopiedDanglingCheckedUnsafePtr,
PointeeWithOneCopyAssignedDanglingCheckedUnsafePtr); PointeeWithOneCopyAssignedDanglingCheckedUnsafePtr);