From: Volker Lendecke Date: Sun, 20 Feb 2011 14:08:41 +0000 (+0100) Subject: s3: Protect tldap_errstr against a NULL ld X-Git-Tag: tevent-0.9.11~475 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e99d1de3c4fe3c1ff678270f51ef7e6d3812e878;p=thirdparty%2Fsamba.git s3: Protect tldap_errstr against a NULL ld --- diff --git a/source3/lib/tldap_util.c b/source3/lib/tldap_util.c index b83a1b75f02..8f7ad883ef1 100644 --- a/source3/lib/tldap_util.c +++ b/source3/lib/tldap_util.c @@ -337,7 +337,9 @@ const char *tldap_errstr(TALLOC_CTX *mem_ctx, struct tldap_context *ld, int rc) const char *ld_error = NULL; char *res; - ld_error = tldap_msg_diagnosticmessage(tldap_ctx_lastmsg(ld)); + if (ld != NULL) { + ld_error = tldap_msg_diagnosticmessage(tldap_ctx_lastmsg(ld)); + } res = talloc_asprintf(mem_ctx, "LDAP error %d (%s), %s", rc, tldap_err2string(rc), ld_error ? ld_error : "unknown");