diff -r 000000000000 -r 6474c204b198 js/src/jsapi-tests/testNullRoot.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/jsapi-tests/testNullRoot.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+* vim: set ts=8 sts=4 et sw=4 tw=99:
+*/
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "jsapi-tests/tests.h"
+
+BEGIN_TEST(testNullRoot)
+{
+    obj = nullptr;
+    CHECK(JS::AddObjectRoot(cx, &obj));
+
+    str = nullptr;
+    CHECK(JS::AddStringRoot(cx, &str));
+
+    script = nullptr;
+    CHECK(JS::AddNamedScriptRoot(cx, &script, "testNullRoot's script"));
+
+    // This used to crash because obj was nullptr.
+    JS_GC(cx->runtime());
+
+    JS::RemoveObjectRoot(cx, &obj);
+    JS::RemoveStringRoot(cx, &str);
+    JS::RemoveScriptRoot(cx, &script);
+    return true;
+}
+
+JS::Heap<JSObject *> obj;
+JS::Heap<JSString *> str;
+JS::Heap<JSScript *> script;
+END_TEST(testNullRoot)