From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gorcunov@gmail.com>
Received: from mail-lj1-f196.google.com (mail-lj1-f196.google.com
 [209.85.208.196])
 (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 82D2C469719
 for <tarantool-patches@dev.tarantool.org>;
 Mon, 17 Feb 2020 23:05:16 +0300 (MSK)
Received: by mail-lj1-f196.google.com with SMTP id h23so20252176ljc.8
 for <tarantool-patches@dev.tarantool.org>;
 Mon, 17 Feb 2020 12:05:16 -0800 (PST)
Date: Mon, 17 Feb 2020 23:05:13 +0300
From: Cyrill Gorcunov <gorcunov@gmail.com>
Message-ID: <20200217200513.GB2482@uranus>
References: <20200217155953.25803-1-gorcunov@gmail.com>
 <20200217155953.25803-5-gorcunov@gmail.com>
 <20200217171940.GD11553@atlas> <20200217190508.GA2482@uranus>
 <20200217200156.GB12248@atlas>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200217200156.GB12248@atlas>
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: Konstantin Osipov <kostja.osipov@gmail.com>
Cc: tml <tarantool-patches@dev.tarantool.org>

On Mon, Feb 17, 2020 at 11:01:56PM +0300, Konstantin Osipov wrote:
> >  
> >  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.

Thanks Kostya! I'll prepare a patch with normal subject and
need a test for it as well (hmm, actually the test will
fail in diag_raise nil dereference I suspect but I'll
prepare an internal version to be sure the rollback
is passing). IOW, once I test it I'll resend.