---

pcwalton · pcwalton · commit e0046d3cfc27 · 2011-08-25T17:14:54.000-07:00
yaml --- r: 4933 b: refs/heads/master c: 4dd23f2 h: refs/heads/master i: 4931: e108129 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bd019bdc868e9d563aa72acbb0307deaeca919f
+refs/heads/master: 4dd23f24d65e05169594bfcb45b84adfe4e52516
diff --git a/trunk/src/rt/rust_shape.h b/trunk/src/rt/rust_shape.h
@@ -903,6 +903,8 @@ data<T,U>::walk_obj_contents(bool align, ptr &dp) {
     type_desc *subtydesc =
         *reinterpret_cast<type_desc **>(box_ptr + sizeof(void *));
     ptr obj_closure_dp(box_ptr + sizeof(void *));
+    if (!box_ptr)   // Null check.
+        return;
 
     arena arena;
     type_param *params = type_param::from_obj_shape(subtydesc->shape,

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 8bd019bdc868e9d563aa72acbb0307deaeca919f`
	`2`	`+refs/heads/master: 4dd23f24d65e05169594bfcb45b84adfe4e52516`