Tarantool development patches archive
 help / color / mirror / Atom feed
From: Vladimir Davydov <vdavydov.dev@gmail.com>
To: imeevma@tarantool.org
Cc: tarantool-patches@freelists.org
Subject: Re: [PATCH 1/1] box: add error description
Date: Thu, 10 Jan 2019 18:41:53 +0300	[thread overview]
Message-ID: <20190110154153.j7ypnojs7zoao3eb@esperanza> (raw)
In-Reply-To: <aa2f64838fa5132d85f5e4d216af34a6c11512bd.1547052781.git.imeevma@gmail.com>

On Wed, Jan 09, 2019 at 07:57:05PM +0300, imeevma@tarantool.org wrote:
> This patch adds a description to the error that occurs when
> obuf_alloc() fails in box/port.c.

Changed the comment to

    box: add missing diag_set to port_tuple_dump_msgpack

    Not really critical as obuf_alloc() fails only on OOM, i.e. never in
    practice.

and pushed it to 2.1.

> ---
> 
> https://github.com/tarantool/tarantool/tree/imeevma/add-error-description
> 
>  src/box/port.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/src/box/port.c b/src/box/port.c
> index ef511ea..9904644 100644
> --- a/src/box/port.c
> +++ b/src/box/port.c
> @@ -113,8 +113,11 @@ port_tuple_dump_msgpack(struct port *base, struct obuf *out)
>  {
>  	struct port_tuple *port = port_tuple(base);
>  	char *size_buf = obuf_alloc(out, mp_sizeof_array(port->size));
> -	if (size_buf == NULL)
> +	if (size_buf == NULL) {
> +		diag_set(OutOfMemory, mp_sizeof_array(port->size), "obuf_alloc",
> +			 "size_buf");
>  		return -1;
> +	}
>  	mp_encode_array(size_buf, port->size);
>  	if (port_tuple_dump_msgpack_16(base, out) < 0)
>  		return -1;

      reply	other threads:[~2019-01-10 15:41 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-09 16:57 imeevma
2019-01-10 15:41 ` Vladimir Davydov [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190110154153.j7ypnojs7zoao3eb@esperanza \
    --to=vdavydov.dev@gmail.com \
    --cc=imeevma@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='Re: [PATCH 1/1] box: add error description' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox