From 89c8257bcbc5d69ce8e30a03d59d0dd496c86cb0 Mon Sep 17 00:00:00 2001 From: roytam1 Date: Wed, 15 Sep 2021 11:36:07 +0800 Subject: [PATCH 1/4] Issue #1751 - Fix preprocessor typo to restore ARM Linux buildability --- xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp index 6475132bcf..7c16d0146d 100644 --- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp +++ b/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp @@ -9,7 +9,7 @@ #include "mozilla/Compiler.h" -#if !defined(__arm__) && !(defined(LINUX) +#if !defined(__arm__) && !defined(LINUX) #error "This code is for Linux ARM only. Check that it works on your system, too.\nBeware that this code is highly compiler dependent." #endif From 44959f50f86a3cdea96cc44baf7171eeed12a45e Mon Sep 17 00:00:00 2001 From: roytam1 Date: Wed, 15 Sep 2021 11:36:21 +0800 Subject: [PATCH 2/4] Bug 1724107, be more precise when counting the number of allocator users, r=KrisWright a=RyanVM --- xpcom/threads/TimerThread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpcom/threads/TimerThread.cpp b/xpcom/threads/TimerThread.cpp index d92c2ef90b..db7c924623 100644 --- a/xpcom/threads/TimerThread.cpp +++ b/xpcom/threads/TimerThread.cpp @@ -170,6 +170,7 @@ public: void operator delete(void* aPtr) { sAllocator->Free(aPtr); + sAllocatorUsers--; DeleteAllocatorIfNeeded(); } @@ -193,7 +194,6 @@ private: { MOZ_ASSERT(!sCanDeleteAllocator || sAllocatorUsers > 0, "This will result in us attempting to deallocate the nsTimerEvent allocator twice"); - sAllocatorUsers--; } RefPtr mTimer; From 8d7fa9bdd68bbf96b5d4a4f260baeee1a2e006ed Mon Sep 17 00:00:00 2001 From: roytam1 Date: Wed, 15 Sep 2021 11:36:54 +0800 Subject: [PATCH 3/4] Bug 1723391 - Use RefPtr in ContentChild::RecvGetFilesResponse. r=smaug, a=RyanVM --- dom/ipc/ContentChild.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp index 046934277c..5ff77092ab 100644 --- a/dom/ipc/ContentChild.cpp +++ b/dom/ipc/ContentChild.cpp @@ -2817,10 +2817,10 @@ bool ContentChild::RecvGetFilesResponse(const nsID& aUUID, const GetFilesResponseResult& aResult) { - GetFilesHelperChild* child = mGetFilesPendingRequests.GetWeak(aUUID); + RefPtr child; // This object can already been deleted in case DeleteGetFilesRequest has // been called when the response was sending by the parent. - if (!child) { + if (!mGetFilesPendingRequests.Remove(aUUID, getter_AddRefs(child))) { return true; } @@ -2841,7 +2841,6 @@ ContentChild::RecvGetFilesResponse(const nsID& aUUID, child->Finished(succeeded ? NS_OK : NS_ERROR_OUT_OF_MEMORY); } - mGetFilesPendingRequests.Remove(aUUID); return true; } From cefef008d1e88041f5748ff9baab177b1db69731 Mon Sep 17 00:00:00 2001 From: roytam1 Date: Wed, 15 Sep 2021 11:37:10 +0800 Subject: [PATCH 4/4] Bug 1721107 - block mk protocol, r=dveditz, a=RyanVM --- modules/libpref/init/all.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index d2e34fb4ff..e0dd68e275 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1349,6 +1349,7 @@ pref("network.protocol-handler.external.vbscript", false); pref("network.protocol-handler.external.javascript", false); pref("network.protocol-handler.external.data", false); pref("network.protocol-handler.external.ms-help", false); +pref("network.protocol-handler.external.mk", false); pref("network.protocol-handler.external.res", false); pref("network.protocol-handler.external.shell", false); pref("network.protocol-handler.external.vnd.ms.radio", false);