github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix ReadRegValue when data read from a registry key is of zero length 

Also if install_path read from registry is an empty string, illegal
memory access may result. Fix by using the default value in this
case as well.

Signed-off-by: Selva Nair <selva.nair@gmail.com>
pull/295/head
Selva Nair 2020-02-18 21:06:50 -05:00
parent 2b10316787
commit dd7234534b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
registry.c
View File

@ -96,7 +96,8 @@ GetGlobalRegistryKeys()
regkey = NULL; regkey = NULL;
ShowLocalizedMsg(IDS_ERR_OPEN_REGISTRY); ShowLocalizedMsg(IDS_ERR_OPEN_REGISTRY);
} }
if (!regkey || !GetRegistryValue(regkey, _T(""), openvpn_path, _countof(openvpn_path))) if (!regkey || !GetRegistryValue(regkey, _T(""), openvpn_path, _countof(openvpn_path))
|| _tcslen(openvpn_path) == 0)
{ {
/* error reading registry value */ /* error reading registry value */
if (regkey) if (regkey)
@ -369,7 +370,10 @@ LONG GetRegistryValue(HKEY regkey, const TCHAR *name, TCHAR *data, DWORD len)
return(0); return(0);
data_len /= sizeof(*data); data_len /= sizeof(*data);
if (data_len > 0)
data[data_len - 1] = L'\0'; /* REG_SZ strings are not guaranteed to be null-terminated */ data[data_len - 1] = L'\0'; /* REG_SZ strings are not guaranteed to be null-terminated */
else
data[0] = L'\0';
return(data_len); return(data_len);