sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

ctdb-tools: Close tdb database on error

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12121

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
(cherry picked from commit c9750c821e06364cb4559f857c359c14e6799303)
This commit is contained in:
Amitay Isaacs 2016-08-05 13:25:25 +10:00 committed by Stefan Metzmacher
parent cab7216de2
commit 661f901109
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ctdb/tools/ctdb.c
View File

@ -5442,17 +5442,20 @@ static int control_tfetch(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,
ret = str_to_data(argv[1], strlen(argv[1]), mem_ctx, &key); ret = str_to_data(argv[1], strlen(argv[1]), mem_ctx, &key);
if (ret != 0) { if (ret != 0) {
fprintf(stderr, "Failed to parse key %s\n", argv[1]); fprintf(stderr, "Failed to parse key %s\n", argv[1]);
tdb_close(tdb);
return ret; return ret;
} }
data = tdb_fetch(tdb, key); data = tdb_fetch(tdb, key);
if (data.dptr == NULL) { if (data.dptr == NULL) {
fprintf(stderr, "No record for key %s\n", argv[1]); fprintf(stderr, "No record for key %s\n", argv[1]);
tdb_close(tdb);
return 1; return 1;
} }
if (data.dsize < sizeof(struct ctdb_ltdb_header)) { if (data.dsize < sizeof(struct ctdb_ltdb_header)) {
fprintf(stderr, "Invalid record for key %s\n", argv[1]); fprintf(stderr, "Invalid record for key %s\n", argv[1]);
tdb_close(tdb);
return 1; return 1;
} }
@ -5514,12 +5517,14 @@ static int control_tstore(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,
ret = str_to_data(argv[1], strlen(argv[1]), mem_ctx, &key); ret = str_to_data(argv[1], strlen(argv[1]), mem_ctx, &key);
if (ret != 0) { if (ret != 0) {
fprintf(stderr, "Failed to parse key %s\n", argv[1]); fprintf(stderr, "Failed to parse key %s\n", argv[1]);
tdb_close(tdb);
return ret; return ret;
} }
ret = str_to_data(argv[2], strlen(argv[2]), mem_ctx, &value); ret = str_to_data(argv[2], strlen(argv[2]), mem_ctx, &value);
if (ret != 0) { if (ret != 0) {
fprintf(stderr, "Failed to parse value %s\n", argv[2]); fprintf(stderr, "Failed to parse value %s\n", argv[2]);
tdb_close(tdb);
return ret; return ret;
} }
@ -5540,6 +5545,7 @@ static int control_tstore(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,
data.dptr = talloc_size(mem_ctx, data.dsize); data.dptr = talloc_size(mem_ctx, data.dsize);
if (data.dptr == NULL) { if (data.dptr == NULL) {
fprintf(stderr, "Memory allocation error\n"); fprintf(stderr, "Memory allocation error\n");
tdb_close(tdb);
return 1; return 1;
} }