Bug 743416, crash with showModalDialog, r=jst
authorOlli Pettay <Olli.Pettay@helsinki.fi>
Sat, 14 Apr 2012 11:03:28 +0300
changeset 91593 364f0a5a1d2dc959bba2dfada7bb2eade016d06a
parent 91592 55e7efcc1946416c6c95685dbe72662083f7720f
child 91597 e89cf2062b31c87e51c41c89e0d3a1e28c312cb4
child 93450 2e20bc3aa6506014c132a0fed376451a018ad548
push id22463
push useropettay@mozilla.com
push dateSat, 14 Apr 2012 08:08:45 +0000
treeherdermozilla-central@364f0a5a1d2d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjst
bugs743416
milestone14.0a1
first release with
nightly linux32
364f0a5a1d2d / 14.0a1 / 20120414030731 / files
nightly linux64
364f0a5a1d2d / 14.0a1 / 20120414030731 / files
nightly mac
364f0a5a1d2d / 14.0a1 / 20120414030731 / files
nightly win32
364f0a5a1d2d / 14.0a1 / 20120414030731 / files
nightly win64
364f0a5a1d2d / 14.0a1 / 20120414030731 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 743416, crash with showModalDialog, r=jst
dom/base/nsGlobalWindow.cpp
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -8928,16 +8928,17 @@ nsGlobalWindow::OpenInternal(const nsASt
       }
     }
   }
 
   NS_ENSURE_SUCCESS(rv, rv);
 
   // success!
 
+  NS_ENSURE_TRUE(domReturn, NS_OK);
   domReturn.swap(*aReturn);
 
   if (aDoJSFixups) {      
     nsCOMPtr<nsIDOMChromeWindow> chrome_win(do_QueryInterface(*aReturn));
     if (!chrome_win) {
       // A new non-chrome window was created from a call to
       // window.open() from JavaScript, make sure there's a document in
       // the new window. We do this by simply asking the new window for