r5665: the data within el2->values can still be used at this point, so don't free
authorAndrew Tridgell <tridge@samba.org>
Sat, 5 Mar 2005 21:59:48 +0000 (21:59 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:10:57 +0000 (13:10 -0500)
(This used to be commit 12d03f96637b9298e0cbc7ee544ca97fffcab9f8)

source4/lib/ldb/common/ldb_msg.c

index b145565a84e681bd518dd6c198edb3a3919e639a..4c903cf9368dc07f809748e3cdf47616bafddd12 100644 (file)
@@ -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);
                               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)));
                        if (i+1<msg2->num_elements) {
                                memmove(el2, el2+1, sizeof(struct ldb_message_element) * 
                                        (msg2->num_elements - (i+1)));