wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-08 16:58:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'post-git-tracking' into tracking

Browse source
This commit is contained in:
roytam1 2021-09-16 10:23:46 +08:00
commit 436d3e3029
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dom/ipc/ContentChild.cpp
View file

@ -2817,10 +2817,10 @@ bool
ContentChild::RecvGetFilesResponse(const nsID& aUUID,
const GetFilesResponseResult& aResult)
{
GetFilesHelperChild* child = mGetFilesPendingRequests.GetWeak(aUUID);
RefPtr<GetFilesHelperChild> 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;
}

1
modules/libpref/init/all.js
View file

@ -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);

2
xpcom/threads/TimerThread.cpp
View file

@ -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<nsTimerImpl> mTimer;