[Tarantool-patches] [PATCH 4/4] box/txn: fix nil dereference in txn_rollback

[Konstantin Osipov]

* Cyrill Gorcunov <gorcunov at gmail.com> [20/02/17 22:07]:
> Signed-off-by: Cyrill Gorcunov <gorcunov at 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