]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
ldb-samba:ldif_handlers: dn_link_comparison leaks less
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Thu, 11 Apr 2024 04:59:50 +0000 (16:59 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 23 Apr 2024 01:33:29 +0000 (01:33 +0000)
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>
lib/ldb-samba/ldif_handlers.c

index 2e8b6afb7a8c5b1032853fbeeae70009a2b7ab9e..04b6bcc3e81d958b788ced5b161e4336544e4e08 100644 (file)
@@ -1182,12 +1182,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;
        }