mozilla-central: changeset 254993:b2dc6e6de6b6ed3a3a290ab85521ef4f591cea24

author	Trevor Saunders <tbsaunde@tbsaunde.org>
	Mon, 27 Jul 2015 17:52:03 -0400
changeset 254993	b2dc6e6de6b6ed3a3a290ab85521ef4f591cea24
parent 254992	6a70e09504444427964381427f6008ee14f71fe4
child 254994	74f0c724abfc5ecfff2482098feb5d5986761f08
push id	29126
push user	kwierso@gmail.com
push date	Wed, 29 Jul 2015 00:47:37 +0000
treeherder	mozilla-central@5e36e0daf084 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	davidb
bugs	1187055
milestone	42.0a1
first release with	nightly linux32 2ee9895e032c / 42.0a1 / 20150729030208 / files nightly linux64 2ee9895e032c / 42.0a1 / 20150729030208 / files nightly mac 2ee9895e032c / 42.0a1 / 20150729030208 / files nightly win32 2ee9895e032c / 42.0a1 / 20150729030208 / files nightly win64 2ee9895e032c / 42.0a1 / 20150729030208 / files
last release without	nightly linux32 33dc8a83cfc0 / 42.0a1 / 20150728030209 / files nightly linux64 33dc8a83cfc0 / 42.0a1 / 20150728030209 / files nightly mac 33dc8a83cfc0 / 42.0a1 / 20150728030209 / files nightly win32 33dc8a83cfc0 / 42.0a1 / 20150728030209 / files nightly win64 33dc8a83cfc0 / 42.0a1 / 20150728030209 / files

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

file | annotate | diff | comparison | revisions

--- a/accessible/windows/msaa/Platform.cpp
+++ b/accessible/windows/msaa/Platform.cpp
@@ -44,16 +44,20 @@ a11y::ProxyCreated(ProxyAccessible* aPro
   aProxy->SetWrapper(reinterpret_cast<uintptr_t>(wrapper));
 }
 
 void
 a11y::ProxyDestroyed(ProxyAccessible* aProxy)
 {
   ProxyAccessibleWrap* wrapper =
     reinterpret_cast<ProxyAccessibleWrap*>(aProxy->GetWrapper());
+  MOZ_ASSERT(wrapper);
+  if (!wrapper)
+    return;
+
   wrapper->Shutdown();
   aProxy->SetWrapper(0);
   wrapper->Release();
 }
 
 void
 a11y::ProxyEvent(ProxyAccessible*, uint32_t)
 {