[tarantool-patches] [PATCH v6 1/1] box: fix checkpoint_delete
Kirill Shcherbatov
kshcherbatov at tarantool.org
Thu Dec 6 15:25:46 MSK 2018
http://github.com/tarantool/tarantool/tree/kshch/gh-3858-fix-checkpoint-delete
https://github.com/tarantool/tarantool/issues/3858
The rlist_foreach_entry iterator was used for freeing resources.
As a result there was dirty access to memory during next step of
for-loop.
Replaced with rlist_foreach_entry_safe valid for destructors.
Closes #3858
---
src/box/memtx_engine.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/box/memtx_engine.c b/src/box/memtx_engine.c
index 9e05ecf63..5cf70ab94 100644
--- a/src/box/memtx_engine.c
+++ b/src/box/memtx_engine.c
@@ -610,8 +610,8 @@ checkpoint_new(const char *snap_dirname, uint64_t snap_io_rate_limit)
static void
checkpoint_delete(struct checkpoint *ckpt)
{
- struct checkpoint_entry *entry;
- rlist_foreach_entry(entry, &ckpt->entries, link) {
+ struct checkpoint_entry *entry, *tmp;
+ rlist_foreach_entry_safe(entry, &ckpt->entries, link, tmp) {
entry->iterator->free(entry->iterator);
free(entry);
}
--
2.19.2
More information about the Tarantool-patches
mailing list