commit a1c1fd5b2028a6126ffab0e8aa969f7bc2f57900
author Adam Klein <adamk@chromium.org> Tue Apr 25 23:40:07 2017
committer Adam Klein <adamk@chromium.org> Tue Apr 25 23:41:27 2017
tree 60d016f122ca0786a11e1b2b6fe85923de6c92b8
parent 72d17915df27ddf10d504f76be379a560820fd01

Version 6.0.72.1 (cherry-pick)

Merged 64e06641ebeef8bf86174c9465b5dbc002d73ca4

[heap] Filter out nullptr when registering externally referenced objects

BUG=chromium:713667
LOG=N
TBR=mlippautz@chromium.org

Change-Id: Iafa8eb1cd80c8beb1b64b5c4a1e1cff1632591e9
Reviewed-on: https://chromium-review.googlesource.com/487221
Reviewed-by: Adam Klein <adamk@chromium.org>
Cr-Commit-Position: refs/heads/6.0.72@{#2}
Cr-Branched-From: 83c058a98cc8f4e089f8cb82b728611e323bab94-refs/heads/master@{#44814}

include/v8-version.h

diff --git a/include/v8-version.h b/include/v8-version.h
index e6a2baf..374abe6 100644
--- a/include/v8-version.h
+++ b/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 6
 #define V8_MINOR_VERSION 0
 #define V8_BUILD_NUMBER 72
-#define V8_PATCH_LEVEL 0
+#define V8_PATCH_LEVEL 1
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)

src/heap/heap.cc

diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index eba313d..81ad774 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -5662,6 +5662,10 @@
 
 void Heap::RegisterExternallyReferencedObject(Object** object) {
   HeapObject* heap_object = HeapObject::cast(*object);
+  if (heap_object == nullptr) {
+    // We might encounter non-empty handles that point to nullptr.
+    return;
+  }
   DCHECK(Contains(heap_object));
   if (FLAG_incremental_marking_wrappers && incremental_marking()->IsMarking()) {
     IncrementalMarking::MarkGrey(this, heap_object);