sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-04-24 22:50:23 +03:00
Code

lib/dbwrap: allow dbwrap_merge_dbufs() to update an existing buffer

Browse Source 
This will be useful in future...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15125

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2022-09-10 17:33:31 +02:00 committed by Jeremy Allison
parent 6f2ce1fd34
commit 3c26ee84ce
4 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/dbwrap/dbwrap.c
View File

@ -680,22 +680,28 @@ static ssize_t tdb_data_buf(const TDB_DATA *dbufs, int num_dbufs,
} }
TDB_DATA dbwrap_merge_dbufs(TALLOC_CTX *mem_ctx, NTSTATUS dbwrap_merge_dbufs(TDB_DATA *buf, TALLOC_CTX *mem_ctx,
const TDB_DATA *dbufs, int num_dbufs) const TDB_DATA *dbufs, int num_dbufs)
{ {
ssize_t len = tdb_data_buf(dbufs, num_dbufs, NULL, 0); ssize_t len = tdb_data_buf(dbufs, num_dbufs, NULL, 0);
uint8_t *buf;
if (len == -1) { if (len == -1) {
return (TDB_DATA) {0}; return NT_STATUS_INVALID_PARAMETER;
} }
buf = talloc_array(mem_ctx, uint8_t, len); if (buf->dsize != len) {
if (buf == NULL) { uint8_t *tmp;
return (TDB_DATA) {0};
tmp = talloc_realloc(mem_ctx, buf->dptr, uint8_t, len);
if (tmp == NULL && len != 0) {
return NT_STATUS_NO_MEMORY;
}
buf->dptr = tmp;
buf->dsize = len;
} }
tdb_data_buf(dbufs, num_dbufs, buf, len); tdb_data_buf(dbufs, num_dbufs, buf->dptr, buf->dsize);
return (TDB_DATA) { .dptr = buf, .dsize = len }; return NT_STATUS_OK;
} }

2
lib/dbwrap/dbwrap.h
View File

@ -222,7 +222,7 @@ NTSTATUS dbwrap_parse_marshall_buf(const uint8_t *buf, size_t buflen,
NTSTATUS dbwrap_unmarshall(struct db_context *db, const uint8_t *buf, NTSTATUS dbwrap_unmarshall(struct db_context *db, const uint8_t *buf,
size_t buflen); size_t buflen);
TDB_DATA dbwrap_merge_dbufs(TALLOC_CTX *mem_ctx, NTSTATUS dbwrap_merge_dbufs(TDB_DATA *buf, TALLOC_CTX *mem_ctx,
const TDB_DATA *dbufs, int num_dbufs); const TDB_DATA *dbufs, int num_dbufs);

9
lib/dbwrap/dbwrap_rbt.c
View File

@ -149,9 +149,12 @@ static NTSTATUS db_rbt_storev(struct db_record *rec,
if (num_dbufs == 1) { if (num_dbufs == 1) {
data = dbufs[0]; data = dbufs[0];
} else { } else {
data = dbwrap_merge_dbufs(rec, dbufs, num_dbufs); NTSTATUS status;
if (data.dptr == NULL) {
return NT_STATUS_NO_MEMORY; data = (TDB_DATA) {0};
status = dbwrap_merge_dbufs(&data, rec, dbufs, num_dbufs);
if (!NT_STATUS_IS_OK(status)) {
return status;
} }
to_free = data.dptr; to_free = data.dptr;
} }

8
source3/lib/dbwrap/dbwrap_ctdb.c
View File

@ -674,11 +674,11 @@ static NTSTATUS db_ctdb_storev_transaction(
struct db_ctdb_transaction_handle *h = talloc_get_type_abort( struct db_ctdb_transaction_handle *h = talloc_get_type_abort(
rec->private_data, struct db_ctdb_transaction_handle); rec->private_data, struct db_ctdb_transaction_handle);
NTSTATUS status; NTSTATUS status;
TDB_DATA data; TDB_DATA data = {0};
data = dbwrap_merge_dbufs(rec, dbufs, num_dbufs); status = dbwrap_merge_dbufs(&data, rec, dbufs, num_dbufs);
if (data.dptr == NULL) { if (!NT_STATUS_IS_OK(status)) {
return NT_STATUS_NO_MEMORY; return status;
} }
status = db_ctdb_transaction_store(h, rec->key, data); status = db_ctdb_transaction_store(h, rec->key, data);