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

Clear c->ip and c->ipv6 buffers before reset 

Trac: #1064
Signed-off-by: Selva Nair <selva.nair@gmail.com>
pull/249/head
Selva Nair 2018-05-18 22:17:39 -04:00
parent 0f3ed6c653
commit 3ba0615140
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
openvpn.c
View File

@ -204,18 +204,25 @@ static void
parse_assigned_ip(connection_t *c, const char *msg) parse_assigned_ip(connection_t *c, const char *msg)
{ {
char *sep; char *sep;
CLEAR(c->ip);
CLEAR(c->ipv6);
/* extract local ipv4 address if available*/ /* extract local ipv4 address if available*/
c->ip[0] = L'\0';
sep = strchr(msg, ','); sep = strchr(msg, ',');
if (sep == NULL) if (sep == NULL)
return; return;
/* Convert the IP address to Unicode */ /* Convert the IP address to Unicode */
MultiByteToWideChar(CP_UTF8, 0, msg, sep-msg, c->ip, _countof(c->ip)); if (sep - msg > 0
&& MultiByteToWideChar(CP_UTF8, 0, msg, sep-msg, c->ip, _countof(c->ip)-1) == 0)
{
WriteStatusLog(c, L"GUI> ", L"Failed to extract the assigned ipv4 address (error = %d)",
GetLastError());
c->ip[0] = L'\0';
}
/* extract local ipv6 address if available */ /* extract local ipv6 address if available */
c->ipv6[0] = L'\0';
/* skip 4 commas */ /* skip 4 commas */
for (int i = 0; i < 4 && sep; i++) for (int i = 0; i < 4 && sep; i++)
{ {
@ -226,7 +233,12 @@ parse_assigned_ip(connection_t *c, const char *msg)
sep++; /* start of ipv6 address */ sep++; /* start of ipv6 address */
/* Convert the IP address to Unicode */ /* Convert the IP address to Unicode */
MultiByteToWideChar(CP_UTF8, 0, sep, -1, c->ipv6, _countof(c->ipv6)); if (MultiByteToWideChar(CP_UTF8, 0, sep, -1, c->ipv6, _countof(c->ipv6)-1) == 0)
{
WriteStatusLog(c, L"GUI> ", L"Failed to extract the assigned ipv6 address (error = %d)",
GetLastError());
c->ipv6[0] = L'\0';
}
} }
/* /*