diff --git a/library/x509_crt.c b/library/x509_crt.c
index b02e1241e8..056e46308b 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -370,6 +370,10 @@ static int x509_get_ocsp_nocheck( unsigned char **p,
         return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
                 MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
 
+    if( *p != end )
+        return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
+                MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
+
     return( 0 );
 }