diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-03-05 21:59:48 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:10:57 -0500 |
commit | 2f9e1650f9fe5a17a1f8d29f1ae4b04c33a91190 (patch) | |
tree | 10c3ca6be72b4794d934abe103d58d0684d4dd05 | |
parent | ec97506a51bf211409dedd6f14b5a40267879c94 (diff) | |
download | samba-2f9e1650f9fe5a17a1f8d29f1ae4b04c33a91190.tar.gz samba-2f9e1650f9fe5a17a1f8d29f1ae4b04c33a91190.tar.bz2 samba-2f9e1650f9fe5a17a1f8d29f1ae4b04c33a91190.zip |
r5665: the data within el2->values can still be used at this point, so don't free
(This used to be commit 12d03f96637b9298e0cbc7ee544ca97fffcab9f8)
-rw-r--r-- | source4/lib/ldb/common/ldb_msg.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source4/lib/ldb/common/ldb_msg.c b/source4/lib/ldb/common/ldb_msg.c index b145565a84..4c903cf936 100644 --- a/source4/lib/ldb/common/ldb_msg.c +++ b/source4/lib/ldb/common/ldb_msg.c @@ -445,7 +445,6 @@ struct ldb_message *ldb_msg_canonicalize(struct ldb_context *ldb, sizeof(struct ldb_val) * el2->num_values); el1->num_values += el2->num_values; talloc_free(el2->name); - talloc_free(el2->values); if (i+1<msg2->num_elements) { memmove(el2, el2+1, sizeof(struct ldb_message_element) * (msg2->num_elements - (i+1))); |