From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <kostja@tarantool.org>
Date: Wed, 26 Sep 2018 01:33:19 +0300
From: Konstantin Osipov <kostja@tarantool.org>
Subject: Re: [tarantool-patches] [PATCH v2 2/2] recovery: fix incorrect
 handling of empty-body requests.
Message-ID: <20180925223319.GD3137@chai>
References: <cover.1537797732.git.sergepetrenko@tarantool.org>
 <a4e80c4c9d1642e017559b1949b65360057085a0.1537797732.git.sergepetrenko@tarantool.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <a4e80c4c9d1642e017559b1949b65360057085a0.1537797732.git.sergepetrenko@tarantool.org>
To: tarantool-patches@freelists.org
Cc: vdavydov.dev@gmail.com, Serge Petrenko <sergepetrenko@tarantool.org>
List-ID: <tarantool-patches.dev.tarantool.org>

* Serge Petrenko <sergepetrenko@tarantool.org> [18/09/24 18:11]:
> diff --git a/src/box/xrow.c b/src/box/xrow.c
> index 7a35d0db1..4473acfe3 100644
> --- a/src/box/xrow.c
> +++ b/src/box/xrow.c
> @@ -135,7 +135,8 @@ error:
>  		}
>  	}
>  	assert(*pos <= end);
> -	if (*pos < end) {
> +	/* Nop requests aren't supposed to have a body. */
> +	if (*pos < end && header->type != IPROTO_NOP) {
>  		const char *body = *pos;
>  		if (mp_check(pos, end)) {
>  			diag_set(ClientError, ER_INVALID_MSGPACK, "packet body");

This patch LGTM.

-- 
Konstantin Osipov, Moscow, Russia, +7 903 626 22 32
http://tarantool.io - www.twitter.com/kostja_osipov