diff options
| -rw-r--r-- | lib/ldb/ldb_tdb/ldb_tdb.c | 14 | ||||
| -rw-r--r-- | lib/ldb/ldb_tdb/ldb_tdb.h | 8 |
2 files changed, 12 insertions, 10 deletions
diff --git a/lib/ldb/ldb_tdb/ldb_tdb.c b/lib/ldb/ldb_tdb/ldb_tdb.c index f07a9d2ae7..3630a18594 100644 --- a/lib/ldb/ldb_tdb/ldb_tdb.c +++ b/lib/ldb/ldb_tdb/ldb_tdb.c @@ -52,6 +52,12 @@ #include "ldb_tdb.h" #include <lib/tdb_compat/tdb_compat.h> +/* + prevent memory errors on callbacks +*/ +struct ltdb_req_spy { + struct ltdb_context *ctx; +}; /* map a tdb error code to a ldb error code @@ -1221,9 +1227,10 @@ static void ltdb_timeout(struct tevent_context *ev, ltdb_request_done(ctx, LDB_ERR_TIME_LIMIT_EXCEEDED); } - if (!ctx->request_terminated) { + if (ctx->spy) { /* neutralize the spy */ ctx->spy->ctx = NULL; + ctx->spy = NULL; } talloc_free(ctx); } @@ -1318,9 +1325,10 @@ static void ltdb_callback(struct tevent_context *ev, } done: - if (!ctx->request_terminated) { + if (ctx->spy) { /* neutralize the spy */ ctx->spy->ctx = NULL; + ctx->spy = NULL; } talloc_free(ctx); } @@ -1330,7 +1338,9 @@ static int ltdb_request_destructor(void *ptr) struct ltdb_req_spy *spy = talloc_get_type(ptr, struct ltdb_req_spy); if (spy->ctx != NULL) { + spy->ctx->spy = NULL; spy->ctx->request_terminated = true; + spy->ctx = NULL; } return 0; diff --git a/lib/ldb/ldb_tdb/ldb_tdb.h b/lib/ldb/ldb_tdb/ldb_tdb.h index 96ad43fbd6..29856bf827 100644 --- a/lib/ldb/ldb_tdb/ldb_tdb.h +++ b/lib/ldb/ldb_tdb/ldb_tdb.h @@ -33,14 +33,6 @@ struct ltdb_private { bool warn_unindexed; }; -/* - the async local context - holds also internal search state during a full db search -*/ -struct ltdb_req_spy { - struct ltdb_context *ctx; -}; - struct ltdb_context { struct ldb_module *module; struct ldb_request *req; |