ldb-samba:ldif_handlers: dn_link_comparison leaks less

dn1 and dn2 can be invalid but still occupying memory.
(ldb_dn_validate(dn2) does contain a NULL check, but a lot more besides).

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

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 341b8fb60e291ad598fafd7a09a75e9b249de07f)

diff --git a/lib/ldb-samba/ldif_handlers.c b/lib/ldb-samba/ldif_handlers.c
index df5a23c4458e8d784a16b8a16d3e3c86695eb106..90973cbf3c30c76f2f3fd333267a5405f214dc91 100644 (file)
--- a/lib/ldb-samba/ldif_handlers.c
+++ b/lib/ldb-samba/ldif_handlers.c
@@ -1180,12 +1180,14 @@ static int samba_ldb_dn_link_comparison(struct ldb_context *ldb, void *mem_ctx,
 
        dn1 = ldb_dn_from_ldb_val(mem_ctx, ldb, v1);
        if ( ! ldb_dn_validate(dn1)) {
+               TALLOC_FREE(dn1);
                return 1;
        }
 
        dn2 = ldb_dn_from_ldb_val(mem_ctx, ldb, v2);
        if ( ! ldb_dn_validate(dn2)) {
-               talloc_free(dn1);
+               TALLOC_FREE(dn1);
+               TALLOC_FREE(dn2);
                return -1;
        }