Browse Source

Merge remote-tracking branch 'origin/tracking' into custom

custom
roytam1 1 month ago
parent
commit
e5ac0b779f
  1. 5
      dom/ipc/ContentChild.cpp
  2. 1
      modules/libpref/init/all.js

5
dom/ipc/ContentChild.cpp

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

@ -1353,6 +1353,7 @@ pref("network.protocol-handler.external.iehistory", false);
pref("network.protocol-handler.external.ierss", false);
pref("network.protocol-handler.external.mk", 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);

Loading…
Cancel
Save