[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aroben at apple.com
aroben at apple.com
Wed Dec 22 14:02:18 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit eb6c17655d202b9ec121359bb5f7e114c8df63b5
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 1 18:56:10 2010 +0000
Don't assume AccessibleObjectFromEvent succeeds
Fixes <http://webkit.org/b/44136> <rdar://problem/8321684> Crash in
DumpRenderTree!notificationListenerProc when running
plugins/access-after-page-destroyed.html
Reviewed by Sam Weinig.
* DumpRenderTree/win/AccessibilityControllerWin.cpp:
(notificationListenerProc): Check both the return value of
AccessibleObjectFromEvent and the object it returns, as MSDN
recommends.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68907 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 32723a5..d33bccd 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-01 Adam Roben <aroben at apple.com>
+
+ Don't assume AccessibleObjectFromEvent succeeds
+
+ Fixes <http://webkit.org/b/44136> <rdar://problem/8321684> Crash in
+ DumpRenderTree!notificationListenerProc when running
+ plugins/access-after-page-destroyed.html
+
+ Reviewed by Sam Weinig.
+
+ * DumpRenderTree/win/AccessibilityControllerWin.cpp:
+ (notificationListenerProc): Check both the return value of
+ AccessibleObjectFromEvent and the object it returns, as MSDN
+ recommends.
+
2010-10-01 Gabor Rapcsanyi <rgabor at inf.u-szeged.hu>
Reviewed by Tony Chang.
diff --git a/WebKitTools/DumpRenderTree/win/AccessibilityControllerWin.cpp b/WebKitTools/DumpRenderTree/win/AccessibilityControllerWin.cpp
index 255bfc3..f03c102 100644
--- a/WebKitTools/DumpRenderTree/win/AccessibilityControllerWin.cpp
+++ b/WebKitTools/DumpRenderTree/win/AccessibilityControllerWin.cpp
@@ -232,7 +232,8 @@ static void CALLBACK notificationListenerProc(HWINEVENTHOOK, DWORD event, HWND h
VariantInit(&vChild);
HRESULT hr = AccessibleObjectFromEvent(hwnd, idObject, idChild, &parentObject, &vChild);
- ASSERT(SUCCEEDED(hr));
+ if (FAILED(hr) || !parentObject)
+ return;
COMPtr<IDispatch> childDispatch;
if (FAILED(parentObject->get_accChild(vChild, &childDispatch))) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list