summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-10-04 20:22:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:20:33 -0500
commitecd970abb657ac9472d05bef0f67148cb8ce33e7 (patch)
tree4619abee9471faec457221d171426970dcb40b87 /source4
parentc56585e5fecb409524607a00dbe5b6e6a956b895 (diff)
downloadsamba-ecd970abb657ac9472d05bef0f67148cb8ce33e7.tar.gz
samba-ecd970abb657ac9472d05bef0f67148cb8ce33e7.tar.bz2
samba-ecd970abb657ac9472d05bef0f67148cb8ce33e7.zip
r19076: ldb_dn_copy_partial can fail
(This used to be commit 78aa689a74941cd6873a91c429889a4c1d1a6432)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/ldb/common/ldb_dn.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source4/lib/ldb/common/ldb_dn.c b/source4/lib/ldb/common/ldb_dn.c
index a52569119f..f1d0f185ad 100644
--- a/source4/lib/ldb/common/ldb_dn.c
+++ b/source4/lib/ldb/common/ldb_dn.c
@@ -818,6 +818,7 @@ struct ldb_dn *ldb_dn_compose(void *mem_ctx, const struct ldb_dn *dn1, const str
int comp_num = dn2->comp_num;
if (dn1 != NULL) comp_num += dn1->comp_num;
newdn = ldb_dn_copy_partial(mem_ctx, dn2, comp_num);
+ LDB_DN_NULL_FAILED(newdn);
}
if (dn1 == NULL) {