commit e8879d67d9e1734afc438d22fa7995312d15da96
author Mathieu Chartier <mathieuc@google.com> Fri May 09 16:44:32 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 09 16:44:32 2014 +0000
tree 59f7e83e8477801a2bbe85877411adb88cfa35a2
parent 90cf3eefb4cd4dbd7ccd514738055b4d193981fe
parent a17288e3b9dd6751005fed3386251d2d0949be74

Merge "Add null check in MarkSweepMarkObjectSlowPath."

runtime/gc/collector/mark_sweep.cc

diff --git a/runtime/gc/collector/mark_sweep.cc b/runtime/gc/collector/mark_sweep.cc
index ff2eda0..5de7026 100644
--- a/runtime/gc/collector/mark_sweep.cc
+++ b/runtime/gc/collector/mark_sweep.cc
@@ -378,7 +378,7 @@
       ++mark_sweep_->large_object_mark_;
     }
     space::LargeObjectSpace* large_object_space = mark_sweep_->GetHeap()->GetLargeObjectsSpace();
-    if (UNLIKELY(!IsAligned<kPageSize>(obj) ||
+    if (UNLIKELY(obj == nullptr || !IsAligned<kPageSize>(obj) ||
                  (kIsDebugBuild && !large_object_space->Contains(obj)))) {
       LOG(ERROR) << "Tried to mark " << obj << " not contained by any spaces";
       LOG(ERROR) << "Attempting see if it's a bad root";