Avoid seemingly-possible overflow

By looking just at that test, it looks like 2 + dn_size could overflow. In
fact that can't happen as that would mean we've read a CA cert of size is too
big to be represented by a size_t.

However, it's best for code to be more obviously free of overflow without
having to reason about the bigger picture.
This commit is contained in:
Manuel Pégourié-Gonnard 2015-12-10 14:36:25 +01:00 committed by Simon Butcher
parent e4ed3475b0
commit cf16b79238

View File

@ -2409,7 +2409,9 @@ static int ssl_write_certificate_request( ssl_context *ssl )
{
dn_size = crt->subject_raw.len;
if( end < p || (size_t)( end - p ) < 2 + dn_size )
if( end < p ||
(size_t)( end - p ) < dn_size ||
(size_t)( end - p ) < 2 + dn_size )
{
SSL_DEBUG_MSG( 1, ( "skipping CAs: buffer too short" ) );
break;