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 <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/lib/ldb/ldb_key_value/ldb_kv_index.c b/lib/ldb/ldb_key_value/ldb_kv_index.c
index 0ddee3ab501f1f500baaeedacd4b9a18dff75e7a..58284fd46bd93f9ebbfdad223848b7a4531df2b6 100644 (file)
--- 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;