summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2022-04-08 10:22:20 -0500
committerMatt A. Tobin <email@mattatobin.com>2022-04-08 10:22:20 -0500
commit68f235e2ccd1f18001ec105b2dbe6a2100f4c1ad (patch)
treeb78325f398520dc5eabcbd02cc200a74c405c56c /system
parent32d6e5d72628f42d7c171228ca86f3e84430258f (diff)
downloadaura-central-68f235e2ccd1f18001ec105b2dbe6a2100f4c1ad.tar.gz
Fix currently identified Moonchild Sabotage
Diffstat (limited to 'system')
-rw-r--r--system/interface/GfxInfoBase.cpp5
-rw-r--r--system/network/protocol/http/nsHttpConnectionMgr.cpp1
2 files changed, 2 insertions, 4 deletions
diff --git a/system/interface/GfxInfoBase.cpp b/system/interface/GfxInfoBase.cpp
index d68cfc07f..4f99bcd0e 100644
--- a/system/interface/GfxInfoBase.cpp
+++ b/system/interface/GfxInfoBase.cpp
@@ -599,15 +599,14 @@ GfxInfoBase::GetFeatureStatus(int32_t aFeature, nsACString& aFailureId, int32_t*
// aBlockedOS is describing the system(s) we are trying to block.
// aSystemOS is describing the system we are running on.
//
-// aSystemOS should not be "Windows" or "OSX" - it should be set to
+// aSystemOS should not be "Windows" - it should be set to
// a particular version instead.
// However, it is valid for aBlockedOS to be one of those generic values,
// as we could be blocking all of the versions.
inline bool
MatchingOperatingSystems(OperatingSystem aBlockedOS, OperatingSystem aSystemOS)
{
- MOZ_ASSERT(aSystemOS != OperatingSystem::Windows &&
- aSystemOS != OperatingSystem::OSX);
+ MOZ_ASSERT(aSystemOS != OperatingSystem::Windows);
// If the block entry OS is unknown, it doesn't match
if (aBlockedOS == OperatingSystem::Unknown) {
diff --git a/system/network/protocol/http/nsHttpConnectionMgr.cpp b/system/network/protocol/http/nsHttpConnectionMgr.cpp
index 70d051f74..bc8aa1d15 100644
--- a/system/network/protocol/http/nsHttpConnectionMgr.cpp
+++ b/system/network/protocol/http/nsHttpConnectionMgr.cpp
@@ -2630,7 +2630,6 @@ nsHttpConnectionMgr::OnMsgCompleteUpgrade(int32_t, ARefBase *param)
void
nsHttpConnectionMgr::OnMsgUpdateParam(int32_t inParam, ARefBase *)
{
- MOZ_ASSERT(OnSocketThread(), "not on socket thread");
uint32_t param = static_cast<uint32_t>(inParam);
uint16_t name = ((param) & 0xFFFF0000) >> 16;
uint16_t value = param & 0x0000FFFF;