From 56cb90a482737ae5252ac8b7ccbc0aff0b309410 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Mon, 4 May 2020 13:11:28 +0000 Subject: Issue #1517 - Remove dom.event.highrestimestamp.enabled pref This resolves #1517 --- modules/libpref/init/all.js | 1 - 1 file changed, 1 deletion(-) (limited to 'modules') diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 333c30d17..0193c5ef1 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1247,7 +1247,6 @@ pref("privacy.trackingprotection.pbmode.enabled", false); pref("dom.event.contextmenu.enabled", true); pref("dom.event.clipboardevents.enabled", true); -pref("dom.event.highrestimestamp.enabled", true); pref("dom.webcomponents.enabled", false); pref("dom.webcomponents.customelements.enabled", false); -- cgit v1.2.3 From 8b3b85854666ce1cabc25bda77f642e387ea49f6 Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Tue, 5 May 2020 23:22:19 +0000 Subject: Prevent the existance of dangling pointers upon failure of FindDataStart. --- modules/libjar/nsZipArchive.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/libjar/nsZipArchive.cpp b/modules/libjar/nsZipArchive.cpp index 841503ebf..2f12af5f0 100644 --- a/modules/libjar/nsZipArchive.cpp +++ b/modules/libjar/nsZipArchive.cpp @@ -217,16 +217,17 @@ nsresult nsZipHandle::Init(nsIFile *file, nsZipHandle **ret, #else handle->mNSPRFileDesc = fd.forget(); #endif - handle->mMap = map; handle->mFile.Init(file); handle->mTotalLen = (uint32_t) size; handle->mFileStart = buf; rv = handle->findDataStart(); if (NS_FAILED(rv)) { PR_MemUnmap(buf, (uint32_t) size); + handle->mFileStart = nullptr; PR_CloseFileMap(map); return rv; } + handle->mMap = map; handle.forget(ret); return NS_OK; } -- cgit v1.2.3