From 608e254ed2d997cf5a7c701f141638a3b15bf680 Mon Sep 17 00:00:00 2001
From: Trevor Saunders <tbsaunde@tbsaunde.org>
Date: Mon, 27 Jul 2015 17:52:03 -0400
Subject: [PATCH] bug 1187055 - check the proxy being destroyed has a wrapper
before cleaning it up r=davidb
All proxies should have wrappers on windows. So it doesn't make much sense
that we need a null check here, however it seems to happen in the wild that
proxy->GetWrapper() returns null.
---
accessible/windows/msaa/Platform.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/accessible/windows/msaa/Platform.cpp b/accessible/windows/msaa/Platform.cpp
index b2b0aa54558a1..65b33102f3ef7 100644
--- a/accessible/windows/msaa/Platform.cpp
+++ b/accessible/windows/msaa/Platform.cpp
@@ -49,6 +49,10 @@ a11y::ProxyDestroyed(ProxyAccessible* aProxy)
{
ProxyAccessibleWrap* wrapper =
reinterpret_cast<ProxyAccessibleWrap*>(aProxy->GetWrapper());
+ MOZ_ASSERT(wrapper);
+ if (!wrapper)
+ return;
+
wrapper->Shutdown();
aProxy->SetWrapper(0);
wrapper->Release();
--
GitLab