diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 96e867b..0a7fee1 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -4148,6 +4148,9 @@
     if( ssl->hostname_len + 1 == 0 )
         return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
 
+    if( ssl->hostname_len > SSL_MAX_HOST_NAME_LEN )
+        return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
+
     ssl->hostname = polarssl_malloc( ssl->hostname_len + 1 );
 
     if( ssl->hostname == NULL )