Commit f22132e
deps: v8: fix potential segfault in profiler
This change fixes a potential segfault in the sampling heap profiler.
This landed as part of a larger change upstream [1]. This is the minimal
backport that avoids the segfault.
[1]: https://git.io/vdTYL
PR-URL: #15498
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 1483ebd commit f22132e
1 file changed
Lines changed: 5 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -146,8 +146,11 @@ class SamplingAllocationObserver : public AllocationObserver { | |||
| 146 | 146 | void Step(int bytes_allocated, Address soon_object, size_t size) override { | |
| 147 | 147 | USE(heap_); | |
| 148 | 148 | DCHECK(heap_->gc_state() == Heap::NOT_IN_GC); | |
| 149 | - DCHECK(soon_object); | ||
| 150 | - profiler_->SampleObject(soon_object, size); | ||
| 149 | + if (soon_object) { | ||
| 150 | + // TODO(ofrobots): it would be better to sample the next object rather | ||
| 151 | + // than skipping this sample epoch if soon_object happens to be null. | ||
| 152 | + profiler_->SampleObject(soon_object, size); | ||
| 153 | + } | ||
| 151 | 154 | } | |
| 152 | 155 | ||
| 153 | 156 | intptr_t GetNextStepSize() override { return GetNextSampleInterval(rate_); } | |
0 commit comments