summaryrefslogtreecommitdiff
path: root/lib/dbwrap/dbwrap_rbt.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/dbwrap/dbwrap_rbt.c')
-rw-r--r--lib/dbwrap/dbwrap_rbt.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c
index db456dfffba..691acef688d 100644
--- a/lib/dbwrap/dbwrap_rbt.c
+++ b/lib/dbwrap/dbwrap_rbt.c
@@ -149,9 +149,12 @@ static NTSTATUS db_rbt_storev(struct db_record *rec,
if (num_dbufs == 1) {
data = dbufs[0];
} else {
- data = dbwrap_merge_dbufs(rec, dbufs, num_dbufs);
- if (data.dptr == NULL) {
- return NT_STATUS_NO_MEMORY;
+ NTSTATUS status;
+
+ 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;
}