Commit 6f06cf0
src: delete BaseObjectWeakPtr data when pointee is gone
Fix the condition for deleting the underlying data pointed to by
a `BaseObjectWeakPtr`, which erroneously skipped that deletion
when `ptr->get()` was `nullptr`. This fixes a memory leak reported
by some of the tests.
Refs: #30374 (comment)
PR-URL: #32393
Reviewed-By: Matheus Marchini <mat@mmarchini.me>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>1 parent 2bcf535 commit 6f06cf0
1 file changed
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -234,13 +234,13 @@ BaseObject* BaseObjectPtrImpl<T, kIsWeak>::get_base_object() const { | |||
| 234 | 234 | ||
| 235 | 235 | template <typename T, bool kIsWeak> | |
| 236 | 236 | BaseObjectPtrImpl<T, kIsWeak>::~BaseObjectPtrImpl() { | |
| 237 | - if (get() == nullptr) return; | ||
| 238 | 237 | if (kIsWeak) { | |
| 239 | - if (--pointer_data()->weak_ptr_count == 0 && | ||
| 238 | + if (pointer_data() != nullptr && | ||
| 239 | + --pointer_data()->weak_ptr_count == 0 && | ||
| 240 | 240 | pointer_data()->self == nullptr) { | |
| 241 | 241 | delete pointer_data(); | |
| 242 | 242 | } | |
| 243 | - } else { | ||
| 243 | + } else if (get() != nullptr) { | ||
| 244 | 244 | get()->decrease_refcount(); | |
| 245 | 245 | } | |
| 246 | 246 | } | |
0 commit comments