git.samba.org
/
samba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
r5665: the data within el2->values can still be used at this point, so don't free
[samba.git]
/
source4
/
lib
/
ldb
/
common
/
ldb_msg.c
diff --git
a/source4/lib/ldb/common/ldb_msg.c
b/source4/lib/ldb/common/ldb_msg.c
index b145565a84e681bd518dd6c198edb3a3919e639a..4c903cf9368dc07f809748e3cdf47616bafddd12 100644
(file)
--- 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)));