lib/util: Avoid overwriting talloc chunk name in talloc_keep_secret()

Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/lib/util/talloc_keep_secret.c b/lib/util/talloc_keep_secret.c
index eb5bb80ff37fc330a965909526ea7c3c5e61ee69..c7d66a4d5e7bd9a4f1544cb5235b341c35966a2e 100644 (file)
--- a/lib/util/talloc_keep_secret.c
+++ b/lib/util/talloc_keep_secret.c
@@ -49,6 +49,5 @@ void _talloc_keep_secret(void *ptr, const char *name)
                return;
        }
 
-       talloc_set_name_const(ptr, name);
        talloc_set_destructor(ptr, talloc_keep_secret_destructor);
 }

diff --git a/lib/util/tests/test_talloc_keep_secret.c b/lib/util/tests/test_talloc_keep_secret.c
index 66c3f7f3e7a1db267405ec31efb1b55cfe607309..7c39431694d9624d6e17d87b7024e30a85d1e1e9 100644 (file)
--- a/lib/util/tests/test_talloc_keep_secret.c
+++ b/lib/util/tests/test_talloc_keep_secret.c
@@ -24,7 +24,6 @@ static void test_talloc_keep_secret(void ** state)
        TALLOC_CTX *pool = NULL;
        char *ptr1 = NULL;
        char *ptr2 = NULL;
-       const char *ptr1_talloc_name = NULL;
        size_t ptr1_size;
        size_t i;
 
@@ -37,9 +36,6 @@ static void test_talloc_keep_secret(void ** state)
 
        talloc_keep_secret(ptr1);
 
-       ptr1_talloc_name = talloc_get_name(ptr1);
-       assert_string_equal(ptr1_talloc_name, "ptr1");
-
        ptr1_size = talloc_get_size(ptr1);
        assert_int_equal(ptr1_size, strlen(ptr1) + 1);