Bug 934203 - Windows-only startup crash in JS_WrapValue(JSContext*, JS::MutableHandle<JS::Value>) with Twitter Disconnect / Facebook Disconnect. r=bz.
authorPeter Van der Beken <peterv@propagandism.org>
Mon, 04 Nov 2013 14:18:01 +0100
changeset 153463 7e6cb031ed8f5949db6baaa2f576fca2c4479e0c
parent 153462 aea34e69d171f0186b25b6125c5fa5e91e148d31
child 153464 214adf185651b6ab5ff63a9c01ec8ea2cf04621e
push id25589
push userkwierso@gmail.com
push dateTue, 05 Nov 2013 05:09:48 +0000
treeherdermozilla-central@5ba522ec7f89 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs934203
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 934203 - Windows-only startup crash in JS_WrapValue(JSContext*, JS::MutableHandle<JS::Value>) with Twitter Disconnect / Facebook Disconnect. r=bz.
dom/base/nsGlobalWindow.cpp
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -3756,17 +3756,17 @@ nsGlobalWindow::GetContent(nsIDOMWindow*
 }
 
 NS_IMETHODIMP
 nsGlobalWindow::GetScriptableContent(JSContext* aCx, JS::Value* aVal)
 {
   ErrorResult rv;
   JS::Rooted<JSObject*> content(aCx, GetContent(aCx, rv));
   if (!rv.Failed()) {
-    *aVal = JS::ObjectValue(*content);
+    *aVal = JS::ObjectOrNullValue(content);
   }
 
   return rv.ErrorCode();
 }
 
 NS_IMETHODIMP
 nsGlobalWindow::GetPrompter(nsIPrompt** aPrompt)
 {