Add more checks for name->sz

pull/3765/head
Eric Blankenhorn 2021-02-17 12:19:42 -06:00
parent 806b5d7d23
commit 608083f559
1 changed files with 7 additions and 4 deletions

View File

@ -45602,14 +45602,17 @@ int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name,
} }
#else #else
if (flags == XN_FLAG_RFC2253) { if (flags == XN_FLAG_RFC2253) {
if (wolfSSL_BIO_write(bio, name->name + 1, name->sz - 2) if ((name->sz < 3) ||
!= name->sz - 2) (wolfSSL_BIO_write(bio, name->name + 1, name->sz - 2)
!= name->sz - 2))
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
#endif /* WOLFSSL_APACHE_HTTPD || OPENSSL_ALL || WOLFSSL_NGINX */ #endif /* WOLFSSL_APACHE_HTTPD || OPENSSL_ALL || WOLFSSL_NGINX */
else if (wolfSSL_BIO_write(bio, name->name, name->sz - 1) != name->sz - 1) else {
if ((name->sz < 2) ||
(wolfSSL_BIO_write(bio, name->name, name->sz - 1) != name->sz - 1))
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
}
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#endif /* !NO_BIO */ #endif /* !NO_BIO */