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

Cyrill Gorcunov gorcunov at gmail.com
Mon Feb 17 23:05:13 MSK 2020


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.


More information about the Tarantool-patches mailing list