Check for null in return_to_mut. Fixes #4904.

rust-lang · Mar 26, 2013 · 0dc6c41 · 0dc6c41 · bors · Mar 26, 2013
1 parent 5f52669
commit 0dc6c41
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/libcore/unstable/lang.rs b/src/libcore/unstable/lang.rs
@@ -99,8 +99,12 @@ pub unsafe fn borrow_as_imm(a: *u8) {
 #[lang="return_to_mut"]
 #[inline(always)]
 pub unsafe fn return_to_mut(a: *u8) {
-    let a: *mut BoxRepr = transmute(a);
-    (*a).header.ref_count &= !FROZEN_BIT;
+    // Sometimes the box is null, if it is conditionally frozen.
+    // See e.g. #4904.
+    if !a.is_null() {
+        let a: *mut BoxRepr = transmute(a);
+        (*a).header.ref_count &= !FROZEN_BIT;
+    }
 }
 
 #[lang="check_not_borrowed"]