[tor-commits] [tor-browser] 216/311: Bug 1750527: Remove MOZ_CRASH_UNLESS_FUZZING and give IPC_FAIL a reason - rebased on FIREFOX_98_0_1_RELEASE r=jesup a=pascalc
gitolite role
git at cupani.torproject.org
Tue Apr 26 15:30:16 UTC 2022
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch geckoview-99.0.1-11.0-1
in repository tor-browser.
commit 8e5f1f8a340acdc8e5327874ddebc317cfd69a5b
Author: Jens Stutte <jstutte at mozilla.com>
AuthorDate: Wed Mar 16 14:43:11 2022 +0000
Bug 1750527: Remove MOZ_CRASH_UNLESS_FUZZING and give IPC_FAIL a reason - rebased on FIREFOX_98_0_1_RELEASE r=jesup a=pascalc
Differential Revision: https://phabricator.services.mozilla.com/D141235
---
dom/localstorage/ActorsChild.cpp | 2 +-
dom/localstorage/ActorsParent.cpp | 83 ++++++++++++++++-----------------------
2 files changed, 35 insertions(+), 50 deletions(-)
diff --git a/dom/localstorage/ActorsChild.cpp b/dom/localstorage/ActorsChild.cpp
index 24db4d1db7076..1626b16a72eee 100644
--- a/dom/localstorage/ActorsChild.cpp
+++ b/dom/localstorage/ActorsChild.cpp
@@ -141,7 +141,7 @@ mozilla::ipc::IPCResult LSObserverChild::RecvObserve(
QM_TRY_INSPECT(const auto& principal,
PrincipalInfoToPrincipal(aPrincipalInfo),
- IPC_FAIL_NO_REASON(this));
+ IPC_FAIL(this, "PrincipalInfoToPrincipal failed!"));
Storage::NotifyChange(/* aStorage */ nullptr, principal, aKey,
aOldValue.AsString(), aNewValue.AsString(),
diff --git a/dom/localstorage/ActorsParent.cpp b/dom/localstorage/ActorsParent.cpp
index 8cdbb85ca8bd9..5bd619620c648 100644
--- a/dom/localstorage/ActorsParent.cpp
+++ b/dom/localstorage/ActorsParent.cpp
@@ -3197,13 +3197,13 @@ PBackgroundLSDatabaseParent* AllocPBackgroundLSDatabaseParent(
}
if (NS_WARN_IF(!gPreparedDatastores)) {
- MOZ_CRASH_UNLESS_FUZZING();
+ MOZ_ASSERT_UNLESS_FUZZING(false);
return nullptr;
}
PreparedDatastore* preparedDatastore = gPreparedDatastores->Get(aDatastoreId);
if (NS_WARN_IF(!preparedDatastore)) {
- MOZ_CRASH_UNLESS_FUZZING();
+ MOZ_ASSERT_UNLESS_FUZZING(false);
return nullptr;
}
@@ -3272,13 +3272,13 @@ PBackgroundLSObserverParent* AllocPBackgroundLSObserverParent(
}
if (NS_WARN_IF(!gPreparedObsevers)) {
- MOZ_CRASH_UNLESS_FUZZING();
+ MOZ_ASSERT_UNLESS_FUZZING(false);
return nullptr;
}
RefPtr<Observer> observer = gPreparedObsevers->Get(aObserverId);
if (NS_WARN_IF(!observer)) {
- MOZ_CRASH_UNLESS_FUZZING();
+ MOZ_ASSERT_UNLESS_FUZZING(false);
return nullptr;
}
@@ -5434,7 +5434,7 @@ mozilla::ipc::IPCResult Database::RecvDeleteMe() {
IProtocol* mgr = Manager();
if (!PBackgroundLSDatabaseParent::Send__delete__(this)) {
- return IPC_FAIL_NO_REASON(mgr);
+ return IPC_FAIL(mgr, "Send__delete__ failed!");
}
return IPC_OK();
}
@@ -5443,8 +5443,7 @@ mozilla::ipc::IPCResult Database::RecvAllowToClose() {
AssertIsOnBackgroundThread();
if (NS_WARN_IF(mAllowedToClose)) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "mAllowedToClose already set!");
}
AllowToClose();
@@ -5459,12 +5458,12 @@ PBackgroundLSSnapshotParent* Database::AllocPBackgroundLSSnapshotParent(
AssertIsOnBackgroundThread();
if (NS_WARN_IF(aIncreasePeakUsage && aMinSize < 0)) {
- MOZ_CRASH_UNLESS_FUZZING();
+ MOZ_ASSERT_UNLESS_FUZZING(false);
return nullptr;
}
if (NS_WARN_IF(mAllowedToClose)) {
- MOZ_CRASH_UNLESS_FUZZING();
+ MOZ_ASSERT_UNLESS_FUZZING(false);
return nullptr;
}
@@ -5629,7 +5628,7 @@ mozilla::ipc::IPCResult Snapshot::RecvDeleteMe() {
IProtocol* mgr = Manager();
if (!PBackgroundLSSnapshotParent::Send__delete__(this)) {
- return IPC_FAIL_NO_REASON(mgr);
+ return IPC_FAIL(mgr, "Send__delete__ failed!");
}
return IPC_OK();
}
@@ -5641,13 +5640,11 @@ mozilla::ipc::IPCResult Snapshot::RecvCheckpoint(
MOZ_ASSERT(mPeakUsage >= mUsage);
if (NS_WARN_IF(aWriteInfos.IsEmpty())) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "aWriteInfos is empty!");
}
if (NS_WARN_IF(mHasOtherProcessObservers)) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "mHasOtherProcessObservers already set!");
}
mDatastore->BeginUpdateBatch(mUsage);
@@ -5695,13 +5692,11 @@ mozilla::ipc::IPCResult Snapshot::RecvCheckpointAndNotify(
MOZ_ASSERT(mPeakUsage >= mUsage);
if (NS_WARN_IF(aWriteAndNotifyInfos.IsEmpty())) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "aWriteAndNotifyInfos is empty!");
}
if (NS_WARN_IF(!mHasOtherProcessObservers)) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "mHasOtherProcessObservers is not set!");
}
mDatastore->BeginUpdateBatch(mUsage);
@@ -5760,8 +5755,7 @@ mozilla::ipc::IPCResult Snapshot::RecvFinish() {
AssertIsOnBackgroundThread();
if (NS_WARN_IF(mFinishReceived)) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "mFinishReceived already set!");
}
Finish();
@@ -5773,23 +5767,19 @@ mozilla::ipc::IPCResult Snapshot::RecvLoaded() {
AssertIsOnBackgroundThread();
if (NS_WARN_IF(mFinishReceived)) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "mFinishReceived already set!");
}
if (NS_WARN_IF(mLoadedReceived)) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "mLoadedReceived already set!");
}
if (NS_WARN_IF(mLoadedAllItems)) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "mLoadedAllItems already set!");
}
if (NS_WARN_IF(mLoadKeysReceived)) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "mLoadKeysReceived already set!");
}
mLoadedReceived = true;
@@ -5812,23 +5802,23 @@ mozilla::ipc::IPCResult Snapshot::RecvLoadValueAndMoreItems(
MOZ_ASSERT(mDatastore);
if (NS_WARN_IF(mFinishReceived)) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "mFinishReceived already set!");
}
if (NS_WARN_IF(mLoadedReceived)) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "mLoadedReceived already set!");
}
if (NS_WARN_IF(mLoadedAllItems)) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "mLoadedAllItems already set!");
}
- if (mLoadedItems.Contains(aKey) || mUnknownItems.Contains(aKey)) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ if (mLoadedItems.Contains(aKey)) {
+ return IPC_FAIL(this, "mLoadedItems already contains aKey!");
+ }
+
+ if (mUnknownItems.Contains(aKey)) {
+ return IPC_FAIL(this, "mUnknownItems already contains aKey!");
}
if (auto entry = mValues.Lookup(aKey)) {
@@ -5953,18 +5943,15 @@ mozilla::ipc::IPCResult Snapshot::RecvLoadKeys(nsTArray<nsString>* aKeys) {
MOZ_ASSERT(mDatastore);
if (NS_WARN_IF(mFinishReceived)) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "mFinishReceived already set!");
}
if (NS_WARN_IF(mLoadedReceived)) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "mLoadedReceived already set!");
}
if (NS_WARN_IF(mLoadKeysReceived)) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "mLoadKeysReceived already set!");
}
mLoadKeysReceived = true;
@@ -5984,13 +5971,11 @@ mozilla::ipc::IPCResult Snapshot::RecvIncreasePeakUsage(const int64_t& aMinSize,
MOZ_ASSERT(aSize);
if (NS_WARN_IF(aMinSize <= 0)) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "aMinSize not valid!");
}
if (NS_WARN_IF(mFinishReceived)) {
- MOZ_CRASH_UNLESS_FUZZING();
- return IPC_FAIL_NO_REASON(this);
+ return IPC_FAIL(this, "mFinishReceived already set!");
}
int64_t size =
@@ -6067,7 +6052,7 @@ mozilla::ipc::IPCResult Observer::RecvDeleteMe() {
IProtocol* mgr = Manager();
if (!PBackgroundLSObserverParent::Send__delete__(this)) {
- return IPC_FAIL_NO_REASON(mgr);
+ return IPC_FAIL(mgr, "Send__delete__ failed!");
}
return IPC_OK();
}
@@ -6441,7 +6426,7 @@ mozilla::ipc::IPCResult LSRequestBase::RecvCancel() {
IProtocol* mgr = Manager();
if (!PBackgroundLSRequestParent::Send__delete__(this, NS_ERROR_FAILURE)) {
- return IPC_FAIL_NO_REASON(mgr);
+ return IPC_FAIL(mgr, "Send__delete__ failed!");
}
return IPC_OK();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the tor-commits
mailing list