diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-03-28 12:39:12 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-03-28 12:39:12 -0400 |
| commit | c5183ea57fc75205ea9d363cac4c5d6e4bb7cf38 (patch) | |
| tree | a0b4f6b853303a5ccd850867390a4f1c50106886 /linux/timer.c | |
| parent | f3cdace86c8b60a4efaced23b2d31c16dc610da9 (diff) | |
Heap code fix
When deleting an entry from a heap that was at entry h->used - 1, we'd
end up calling heap_sift() on an entry outside the heap - the entry we
just removed - which would end up re-adding it to the heap and deleting
something we didn't want to delete. Oops...
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'linux/timer.c')
| -rw-r--r-- | linux/timer.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linux/timer.c b/linux/timer.c index eb937863..7d519a4d 100644 --- a/linux/timer.c +++ b/linux/timer.c @@ -93,9 +93,11 @@ do { \ \ BUG_ON(_i >= (h)->used); \ (h)->used--; \ - heap_swap(h, _i, (h)->used); \ - heap_sift_down(h, _i, cmp); \ - heap_sift(h, _i, cmp); \ + if ((_i) < (h)->used) { \ + heap_swap(h, _i, (h)->used); \ + heap_sift_down(h, _i, cmp); \ + heap_sift(h, _i, cmp); \ + } \ } while (0) #define heap_pop(h, d, cmp) \ |