From 0798271b371740a9128db17dcba72944d9f26d66 Mon Sep 17 00:00:00 2001 From: Toshihito Kikuchi Date: Mon, 18 May 2020 11:53:09 +0000 Subject: [PATCH] Bug 1576728 - Block more versions of oly[64].dll and pdzipmenu[32|64].dll. r=gcp Since we learned these modules are a shell exntension, blocking in the browser process should suffice. Differential Revision: https://phabricator.services.mozilla.com/D75606 --- mozglue/dllservices/WindowsDllBlocklistDefs.in | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mozglue/dllservices/WindowsDllBlocklistDefs.in b/mozglue/dllservices/WindowsDllBlocklistDefs.in index 3c453643e37d3..b91d9b879e2a7 100644 --- a/mozglue/dllservices/WindowsDllBlocklistDefs.in +++ b/mozglue/dllservices/WindowsDllBlocklistDefs.in @@ -221,12 +221,6 @@ ALL_PROCESSES += [ # 360 Safeguard/360 Total Security causes a11y crashes, bug 1536227. DllBlocklistEntry("safemon64.dll", ALL_VERSIONS), - # FYunZip and PuddingZip cause crashes, bug 1576728 - DllBlocklistEntry("oly64.dll", (1, 1, 3, 19919)), - DllBlocklistEntry("oly.dll", (1, 1, 3, 19919)), - DllBlocklistEntry("pdzipmenu64.dll", UNVERSIONED), - DllBlocklistEntry("pdzipmenu32.dll", UNVERSIONED), - # Old versions of Digital Guardian, bug 1318858 and bug 1603974 RedirectToNoOpEntryPoint("dgapi.dll", (7, 5, 0, 0xffff)), RedirectToNoOpEntryPoint("dgapi64.dll", (7, 5, 0, 0xffff)), @@ -267,6 +261,13 @@ BROWSER_PROCESS += [ # Cambridge Silicon Radio, bug 1634538 DllBlocklistEntry("BLEtokenCredentialProvider.dll", (2, 1, 63, 0)), + + # FYunZip and PuddingZip, loaded as shell extension, cause crashes + # bug 1576728 + DllBlocklistEntry("oly64.dll", (1, 1, 3, 19920)), + DllBlocklistEntry("oly.dll", (1, 1, 3, 19920)), + DllBlocklistEntry("pdzipmenu64.dll", (1, 4, 4, 20103)), + DllBlocklistEntry("pdzipmenu32.dll", (1, 4, 4, 20103)), ] CHILD_PROCESSES += [