- Fixed crash in tls_read (unchecked null pointer)

- also check for empty string on username and password to launch authentication callback

diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c
index 2978a2a..1bface6 100644 (file)
--- a/libfreerdp/core/nla.c
+++ b/libfreerdp/core/nla.c
@@ -119,7 +119,8 @@ int credssp_ntlm_client_init(rdpCredssp* credssp)
        settings = credssp->settings;
        instance = (freerdp*) settings->instance;
 
-       if ((settings->Password == NULL) || (settings->Username == NULL))
+       if ((settings->Password == NULL ) || (settings->Username == NULL)
+                       || (!strlen(settings->Password)) || (!strlen(settings->Username)))
        {
                if (instance->Authenticate)
                {

diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
index ae31758..9d2c407 100644 (file)
--- a/libfreerdp/crypto/tls.c
+++ b/libfreerdp/crypto/tls.c
@@ -373,9 +373,9 @@ int tls_read(rdpTls* tls, BYTE* data, int length)
        int error;
        int status;
 
-       status = SSL_read(tls->ssl, data, length);
+       status = tls ? SSL_read(tls->ssl, data, length) : -1;
 
-       if (status <= 0)
+       if (tls && status <= 0)
        {
                error = SSL_get_error(tls->ssl, status);