ldb: Call TALLOC_FREE(filtered_msg->elements) on ldb_filter_attrs() failure

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Aug 27 01:16:33 UTC 2019 on sn-devel-184

(cherry picked from commit 1521a22f4366c86ec955cb9d32b7a758315d8ce0)

diff --git a/lib/ldb/common/ldb_pack.c b/lib/ldb/common/ldb_pack.c
index b5e1fbbc4ffc87c805446a4a209c2645ae035ba8..e7dd364008a9db7ca35a34e7c180b6c523dba1a3 100644 (file)
--- a/lib/ldb/common/ldb_pack.c
+++ b/lib/ldb/common/ldb_pack.c
@@ -1256,5 +1256,6 @@ int ldb_filter_attrs(struct ldb_context *ldb,
 
        return 0;
 failed:
+       TALLOC_FREE(filtered_msg->elements);
        return -1;
 }

diff --git a/lib/ldb/tests/ldb_filter_attrs_test.c b/lib/ldb/tests/ldb_filter_attrs_test.c
index d04775879acfe4ad5f23c96f93b37b9474bf3eda..7d555e0da2e220d09dcda626a85d6ecb97efcd81 100644 (file)
--- a/lib/ldb/tests/ldb_filter_attrs_test.c
+++ b/lib/ldb/tests/ldb_filter_attrs_test.c
@@ -384,6 +384,7 @@ static void test_filter_attrs_two_dup_attr_matched_one_attr(void **state)
 
        /* This should fail the pidgenhole test */
        assert_int_equal(ret, -1);
+       assert_null(filtered_msg->elements);
 }
 
 /*
@@ -772,6 +773,7 @@ static void test_filter_attrs_one_attr_matched_star_no_dn(void **state)
                               attrs,
                               filtered_msg);
        assert_int_equal(ret, -1);
+       assert_null(filtered_msg->elements);
 }
 
 /*