r18024: The %c sscanf format I'm using doesn't null terminate.

Andrew Bartlett
(This used to be commit 1920cb8b3978f745cba7e854410deb9174de2dc0)

diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index 4fa8cc01464fe1121f276f5acfc944f4afcc2ab5..bc230879fc956d0d55e671efa7668dc3baaf782d 100644 (file)
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -311,9 +311,12 @@ struct composite_context *ldap_connect_send(struct ldap_connection *conn,
                if (!NT_STATUS_IS_OK(status)) {
                        return NULL;
                }
+               talloc_steal(conn, conn->sock);
                SMB_ASSERT(sizeof(protocol)>10);
                SMB_ASSERT(sizeof(path)>1024);
        
+               /* The %c specifier doesn't null terminate :-( */
+               ZERO_STRUCT(path);
                ret = sscanf(url, "%10[^:]://%1025c", protocol, path);
                if (ret < 2) {
                        composite_error(state->ctx, NT_STATUS_INVALID_PARAMETER);