From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <kostja.osipov@gmail.com>
Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com
 [209.85.208.194])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (No client certificate requested)
 by dev.tarantool.org (Postfix) with ESMTPS id EB027469719
 for <tarantool-patches@dev.tarantool.org>;
 Mon, 17 Feb 2020 23:01:58 +0300 (MSK)
Received: by mail-lj1-f194.google.com with SMTP id r19so20232457ljg.3
 for <tarantool-patches@dev.tarantool.org>;
 Mon, 17 Feb 2020 12:01:58 -0800 (PST)
Date: Mon, 17 Feb 2020 23:01:56 +0300
From: Konstantin Osipov <kostja.osipov@gmail.com>
Message-ID: <20200217200156.GB12248@atlas>
References: <20200217155953.25803-1-gorcunov@gmail.com>
 <20200217155953.25803-5-gorcunov@gmail.com>
 <20200217171940.GD11553@atlas> <20200217190508.GA2482@uranus>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200217190508.GA2482@uranus>
Subject: Re: [Tarantool-patches] [PATCH 4/4] box/txn: fix nil dereference in
	txn_rollback
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: tml <tarantool-patches@dev.tarantool.org>

* Cyrill Gorcunov <gorcunov@gmail.com> [20/02/17 22:07]:
> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
> ---
>  src/box/txn.c | 15 ++++++++++-----
>  src/box/wal.c |  1 -
>  2 files changed, 10 insertions(+), 6 deletions(-)
> 
> diff --git a/src/box/txn.c b/src/box/txn.c
> index a4ca48224..a75f8dc0b 100644
> --- a/src/box/txn.c
> +++ b/src/box/txn.c
> @@ -495,10 +495,8 @@ txn_write_to_wal(struct txn *txn)
>  						      &txn->region,
>  						      txn_entry_complete_cb,
>  						      txn);
> -	if (req == NULL) {
> -		txn_rollback(txn);
> +	if (req == NULL)
>  		return -1;
> -	}
>  
>  	struct txn_stmt *stmt;
>  	struct xrow_header **remote_row = req->rows;
> @@ -525,6 +523,8 @@ txn_write_to_wal(struct txn *txn)
>  		diag_log();
>  		return -1;
>  	}
> +
> +	fiber_set_txn(fiber(), NULL);
>  	return 0;
>  }
>  
> @@ -583,8 +583,13 @@ txn_write(struct txn *txn)
>  		fiber_set_txn(fiber(), NULL);
>  		return 0;
>  	}
> -	fiber_set_txn(fiber(), NULL);
> -	return txn_write_to_wal(txn);
> +
> +	if (txn_write_to_wal(txn) < 0) {
> +		txn_rollback(txn);
> +		return -1;
> +	}
> +
> +	return 0;
>  }
>  
>  int
> diff --git a/src/box/wal.c b/src/box/wal.c
> index 0ae66ff32..a8bab4f34 100644
> --- a/src/box/wal.c
> +++ b/src/box/wal.c
> @@ -1209,7 +1209,6 @@ wal_write(struct journal *journal, struct journal_entry *entry)
>  
>  fail:
>  	entry->res = -1;
> -	journal_entry_complete(entry);
>  	return -1;
>  }

This patch is indeed what I was trying to suggest.


-- 
Konstantin Osipov, Moscow, Russia