[Tarantool-patches] [PATCH] vinyl: fix leak in vy_build_recover_stmt

Kirill Yukhin kyukhin at tarantool.org
Mon Oct 5 18:33:06 MSK 2020


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



More information about the Tarantool-patches mailing list