sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

s4-ldb: Use _ldb_msg_add_el() in ldb_msg_add()

Browse Source 
Previous implementation was 'leaking' attribute name
string, that is allocated by ldb_msg_add_empty()

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Kamen Mazdrashki 2010-07-16 13:47:41 +03:00 committed by Andrew Bartlett
parent 3944c81d08
commit 48574ccc3f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source4/lib/ldb/common/ldb_msg.c
View File

@ -187,15 +187,21 @@ int ldb_msg_add(struct ldb_message *msg,
const struct ldb_message_element *el,
int flags)
{
int ret;
struct ldb_message_element *el_new;
/* We have to copy this, just in case *el is a pointer into
* what ldb_msg_add_empty() is about to realloc() */
struct ldb_message_element el_copy = *el;
if (ldb_msg_add_empty(msg, el->name, flags, NULL) != LDB_SUCCESS) {
return LDB_ERR_OPERATIONS_ERROR;
ret = _ldb_msg_add_el(msg, &el_new);
if (ret != LDB_SUCCESS) {
return ret;
}
msg->elements[msg->num_elements-1] = el_copy;
msg->elements[msg->num_elements-1].flags = flags;
el_new->flags = flags;
el_new->name = el_copy.name;
el_new->num_values = el_copy.num_values;
el_new->values = el_copy.values;
return LDB_SUCCESS;
}