From: Douglas Bagnall Date: Sun, 21 Jul 2024 06:07:56 +0000 (+1200) Subject: ldb:kv_index: subtransaction_cancel: check for nested tdb X-Git-Tag: tdb-1.4.11~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18131aebf81ab7cce1faeaa13a56067fb666d1f5;p=thirdparty%2Fsamba.git ldb:kv_index: subtransaction_cancel: check for nested tdb Just in case, but also so ldb_kv_index_transaction_cancel() can use this and retain the same logic. Signed-off-by: Douglas Bagnall Reviewed-by: Stefan Metzmacher --- diff --git a/lib/ldb/ldb_key_value/ldb_kv_index.c b/lib/ldb/ldb_key_value/ldb_kv_index.c index 0ddee3ab501..58284fd46bd 100644 --- a/lib/ldb/ldb_key_value/ldb_kv_index.c +++ b/lib/ldb/ldb_key_value/ldb_kv_index.c @@ -3991,7 +3991,9 @@ int ldb_kv_index_sub_transaction_start(struct ldb_kv_private *ldb_kv) int ldb_kv_index_sub_transaction_cancel(struct ldb_kv_private *ldb_kv) { if (ldb_kv->nested_idx_ptr != NULL) { - tdb_close(ldb_kv->nested_idx_ptr->itdb); + if (ldb_kv->nested_idx_ptr->itdb != NULL) { + tdb_close(ldb_kv->nested_idx_ptr->itdb); + } TALLOC_FREE(ldb_kv->nested_idx_ptr); } return LDB_SUCCESS;