From 2d2674e346b5088e42c61431d8f619c8fe718af9 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sun, 7 Sep 2014 12:42:19 +0200
Subject: [PATCH] Avoid trying to trace a null JSVal.

JSVal::trace_kind() asserts that it is a markable type; null is a gcthing that
is not markable.
---
 src/components/script/dom/bindings/trace.rs | 2 +-
 src/test/content/test_trace_null.html       | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 src/test/content/test_trace_null.html

diff --git a/src/components/script/dom/bindings/trace.rs b/src/components/script/dom/bindings/trace.rs
index f26af087796..42d944e9781 100644
--- a/src/components/script/dom/bindings/trace.rs
+++ b/src/components/script/dom/bindings/trace.rs
@@ -68,7 +68,7 @@ pub trait JSTraceable {
 
 /// Trace a `JSVal`.
 pub fn trace_jsval(tracer: *mut JSTracer, description: &str, val: JSVal) {
-    if !val.is_gcthing() {
+    if !val.is_markable() {
         return;
     }
 
diff --git a/src/test/content/test_trace_null.html b/src/test/content/test_trace_null.html
new file mode 100644
index 00000000000..af074b94f04
--- /dev/null
+++ b/src/test/content/test_trace_null.html
@@ -0,0 +1,7 @@
+<!-- crashtest -->
+<script src=harness.js></script>
+<script>
+new CustomEvent("foo", { detail: null });
+gc();
+finish();
+</script>