mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-19 19:50:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add bounds checking to length returned by wcslen in wide_to_asc conversion to resolve integer overflow flaw

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15316)
This commit is contained in:
Jake Cooke 2021-05-18 18:20:54 +09:30 committed by Pauli
parent bf991b25ca
commit cad4f3facc
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engines/e_capi.c
View File

@ -1120,10 +1120,19 @@ static char *wide_to_asc(LPCWSTR wstr)
{
char *str;
int len_0, sz;
size_t len_1;
if (!wstr)
return NULL;
len_0 = (int)wcslen(wstr) + 1; /* WideCharToMultiByte expects int */
len_1 = wcslen(wstr) + 1;
if (len_1 > INT_MAX) {
CAPIerr(CAPI_F_WIDE_TO_ASC, CAPI_R_FUNCTION_NOT_SUPPORTED);
return NULL;
}
len_0 = (int)len_1; /* WideCharToMultiByte expects int */
sz = WideCharToMultiByte(CP_ACP, 0, wstr, len_0, NULL, 0, NULL, NULL);
if (!sz) {
CAPIerr(CAPI_F_WIDE_TO_ASC, CAPI_R_WIN32_ERROR);