Tarantool development patches archive
 help / color / mirror / Atom feed
From: Kirill Yukhin <kyukhin@tarantool.org>
To: korablev@tarantool.org
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH] vinyl: fix leak in vy_build_recover_stmt
Date: Mon,  5 Oct 2020 18:33:06 +0300	[thread overview]
Message-ID: <2d28f4f21cc5bd3a5a7b03470bc1b257864fef67.1601910155.git.kyukhin@tarantool.org> (raw)

Variable `delete` wasn't free()-ed in case of
error. Free it properly.

Found by static analyzer.
---

The patch is intended for all release branches and master.

Branch: https://github.com/tarantool/tarantool/tree/kyukhin/vy-fix-delete-leak
Issue: N/A
CI status: https://gitlab.com/tarantool/tarantool/-/pipelines/198267805

 src/box/vinyl.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/box/vinyl.c b/src/box/vinyl.c
index cee39c5..a7ab24d 100644
--- a/src/box/vinyl.c
+++ b/src/box/vinyl.c
@@ -4026,19 +4026,21 @@ vy_build_recover_stmt(struct vy_lsm *lsm, struct vy_lsm *pk,
 		insert = vy_stmt_new_insert(lsm->mem_format,
 					    data, data + data_len);
 		if (insert == NULL)
-			return -1;
+			goto err;
 	} else if (type == IPROTO_UPSERT) {
 		struct tuple *new_tuple = vy_apply_upsert(mem_stmt, old_tuple,
 							  pk->cmp_def, true);
 		if (new_tuple == NULL)
-			return -1;
+			goto err;
 		uint32_t data_len;
 		const char *data = tuple_data_range(new_tuple, &data_len);
 		insert = vy_stmt_new_insert(lsm->mem_format,
 					    data, data + data_len);
 		tuple_unref(new_tuple);
-		if (insert == NULL)
-			return -1;
+		if (insert == NULL) {
+			tuple_unref(new_tuple);
+			goto err;
+		}
 	}
 
 	/* Insert DELETE + INSERT into the LSM tree. */
@@ -4055,6 +4057,11 @@ vy_build_recover_stmt(struct vy_lsm *lsm, struct vy_lsm *pk,
 			return -1;
 	}
 	return 0;
+
+err:
+	if (delete != NULL)
+		tuple_unref(delete);
+	return -1;
 }
 
 /**
-- 
1.8.3.1

             reply	other threads:[~2020-10-05 15:33 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-05 15:33 Kirill Yukhin [this message]
2020-10-05 21:37 ` Nikita Pettik
2020-10-06  4:13   ` Kirill Yukhin
2020-10-06 13:33     ` Nikita Pettik

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=2d28f4f21cc5bd3a5a7b03470bc1b257864fef67.1601910155.git.kyukhin@tarantool.org \
    --to=kyukhin@tarantool.org \
    --cc=korablev@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH] vinyl: fix leak in vy_build_recover_stmt' \
    /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