From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <vdavydov.dev@gmail.com>
Date: Thu, 6 Dec 2018 16:00:52 +0300
From: Vladimir Davydov <vdavydov.dev@gmail.com>
Subject: Re: [tarantool-patches] [PATCH v6 1/1] box: fix checkpoint_delete
Message-ID: <20181206130052.kbtt5o4nm6pqkdwm@esperanza>
References: <f635ff4e5e4cca3b295de483b8d484886b3ec251.1544099108.git.kshcherbatov@tarantool.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <f635ff4e5e4cca3b295de483b8d484886b3ec251.1544099108.git.kshcherbatov@tarantool.org>
To: Kirill Shcherbatov <kshcherbatov@tarantool.org>
Cc: tarantool-patches@freelists.org, v.shpilevoy@tarantool.org
List-ID: <tarantool-patches.dev.tarantool.org>

On Thu, Dec 06, 2018 at 03:25:46PM +0300, Kirill Shcherbatov wrote:
> 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);
>  	}

Pushed to 2.1.