diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-05-08 17:53:19 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-05-09 09:37:55 -0700 |
| commit | a17288e3b9dd6751005fed3386251d2d0949be74 (patch) | |
| tree | a044c6bae662c0a9e47da0dc6588c56cdd50125d /runtime | |
| parent | f1c036fc8fa97617cc42bda44a0adbc7b856d6cd (diff) | |
| download | art-a17288e3b9dd6751005fed3386251d2d0949be74.tar.gz art-a17288e3b9dd6751005fed3386251d2d0949be74.tar.bz2 art-a17288e3b9dd6751005fed3386251d2d0949be74.zip | |
Add null check in MarkSweepMarkObjectSlowPath.
Bug: 14626564
Change-Id: Ief387e96b813440a35a7c480897576d1543891f6
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/gc/collector/mark_sweep.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/gc/collector/mark_sweep.cc b/runtime/gc/collector/mark_sweep.cc index ff2eda0e30..5de7026916 100644 --- a/runtime/gc/collector/mark_sweep.cc +++ b/runtime/gc/collector/mark_sweep.cc @@ -378,7 +378,7 @@ class MarkSweepMarkObjectSlowPath { ++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"; |