[PATCH 1/1] box: add error description

[PATCH 1/1] box: add error description

[imeevma]

This patch adds a description to the error that occurs when
obuf_alloc() fails in box/port.c.
---

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;
-- 
2.7.4

Re: [PATCH 1/1] box: add error description

[Vladimir Davydov]

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;