sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s4:ldb Allow ldb_msg_canonicalize to handle empty elements

Browse Source 
(These are deliberately there in DRS replication).

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2009-11-11 19:26:28 +11:00
parent 081d57345f
commit ae72153daa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -526,7 +526,7 @@ struct ldb_message *ldb_msg_canonicalize(struct ldb_context *ldb,
if (ldb_msg_element_compare_name(el1, el2) == 0) {
el1->values = talloc_realloc(msg2->elements, el1->values, struct ldb_val,
el1->num_values + el2->num_values);
if (el1->values == NULL) {
if (el1->num_values + el2->num_values > 0 && el1->values == NULL) {
return NULL;
}
memcpy(el1->values + el1->num_values,