From 3b85915f78b84b7b52ee89dfe0489b20e92791e3 Mon Sep 17 00:00:00 2001 From: Jim Mathies Date: Wed, 28 Apr 2010 13:56:17 -0500 Subject: [PATCH] Bug 557931 - Crash [@ mozilla::widget::WindowHook::Lookup] with createTaskbarTabPreview. r=robarnold. --- widget/src/windows/WinTaskbar.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/widget/src/windows/WinTaskbar.cpp b/widget/src/windows/WinTaskbar.cpp index c5bc9a2194..1bfaf87af5 100644 --- a/widget/src/windows/WinTaskbar.cpp +++ b/widget/src/windows/WinTaskbar.cpp @@ -247,6 +247,9 @@ WinTaskbar::CreateTaskbarTabPreview(nsIDocShell *shell, nsITaskbarPreviewControl HWND toplevelHWND = ::GetAncestor(GetHWNDFromDocShell(shell), GA_ROOT); + if (!toplevelHWND) + return NS_ERROR_INVALID_ARG; + nsRefPtr preview(new TaskbarTabPreview(mTaskbar, controller, toplevelHWND, shell)); if (!preview) return NS_ERROR_OUT_OF_MEMORY; @@ -265,6 +268,9 @@ WinTaskbar::GetTaskbarWindowPreview(nsIDocShell *shell, nsITaskbarWindowPreview HWND toplevelHWND = ::GetAncestor(GetHWNDFromDocShell(shell), GA_ROOT); + if (!toplevelHWND) + return NS_ERROR_INVALID_ARG; + nsWindow *window = nsWindow::GetNSWindowPtr(toplevelHWND); if (!window) -- 2.11.4.GIT