diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 585750ef2..759a4562a 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -2066,7 +2066,7 @@ static int ssl_parse_server_psk_hint( mbedtls_ssl_context *ssl,
     len = (*p)[0] << 8 | (*p)[1];
     *p += 2;
 
-    if( (*p) + len > end )
+    if( (*p) > end - len )
     {
         MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad server key exchange message "
                                     "(psk_identity_hint length)" ) );