corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 431082 - Crash [@ nsDocShell::DoChannelLoad], r+sr=bz

Browse Source
This commit is contained in:
Olli Pettay
2008-12-13 22:30:02 +02:00
parent fdd751563a
commit 0fd4565fc8
6 changed files with 99 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
content/base/src/nsFrameLoader.cpp
View File

@@ -864,18 +864,20 @@ nsFrameLoader::EnsureDocShell()
NS_ASSERTION(frame_element, "frame loader owner element not a DOM element!");
nsCOMPtr<nsPIDOMWindow> win_private(do_GetInterface(mDocShell));
NS_ENSURE_TRUE(win_private, NS_ERROR_UNEXPECTED);
win_private->SetFrameElementInternal(frame_element);
nsCOMPtr<nsIBaseWindow> base_win(do_QueryInterface(mDocShell));
NS_ENSURE_TRUE(base_win, NS_ERROR_UNEXPECTED);
if (win_private) {
win_private->SetFrameElementInternal(frame_element);
}
// This is kinda whacky, this call doesn't really create anything,
// but it must be called to make sure things are properly
// initialized
base_win->Create();
// initialized...
if (NS_FAILED(base_win->Create()) || !win_private) {
// ...but if we couldn't create the shell properly, better
// to make sure it gets removed.
Destroy();
return NS_ERROR_FAILURE;
}
return NS_OK;
}