diff --git a/library/rsa.c b/library/rsa.c
index ca8f688..d531c26 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -1368,6 +1368,8 @@
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
     hlen = md_get_size( md_info );
+    if( siglen < hlen + 2 )
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
     slen = siglen - hlen - 1; /* Currently length of salt + padding */
 
     memset( zeros, 0, 8 );