summaryrefslogtreecommitdiffstats
path: root/mozglue/build/WindowsDllBlocklist.cpp
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-11-04 13:31:30 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-11-04 13:31:30 +0100
commitc5c44d12073791bb1150445ce48bc57fccbb544d (patch)
tree9d7704d17cb06f886b0943d1508c9ff08f4b9570 /mozglue/build/WindowsDllBlocklist.cpp
parenta63272b5303b7aef467e974c630f745146fb983a (diff)
parentbbc2206a0fda053a6f5071b457bd209dab9ed268 (diff)
downloadUXP-c5c44d12073791bb1150445ce48bc57fccbb544d.tar
UXP-c5c44d12073791bb1150445ce48bc57fccbb544d.tar.gz
UXP-c5c44d12073791bb1150445ce48bc57fccbb544d.tar.lz
UXP-c5c44d12073791bb1150445ce48bc57fccbb544d.tar.xz
UXP-c5c44d12073791bb1150445ce48bc57fccbb544d.zip
Merge branch 'master' into certexception-work
Diffstat (limited to 'mozglue/build/WindowsDllBlocklist.cpp')
-rw-r--r--mozglue/build/WindowsDllBlocklist.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/mozglue/build/WindowsDllBlocklist.cpp b/mozglue/build/WindowsDllBlocklist.cpp
index c7d14041d..0686b64cb 100644
--- a/mozglue/build/WindowsDllBlocklist.cpp
+++ b/mozglue/build/WindowsDllBlocklist.cpp
@@ -227,6 +227,9 @@ static DllBlockInfo sWindowsDllBlocklist[] = {
// Comodo IS old versions, startup crash on 64-bit, bug 1140397
{ "guard64.dll", MAKE_VERSION(6, 3, 0, 0) },
+ // 360 Safeguard/360 Total Security causes a11y crashes, bug 1536227.
+ { "safemon64.dll", ALL_VERSIONS },
+
{ nullptr, 0 }
};