From: "cron2 (Code Review)" cron2 upl=
oaded patch set #6 to the change originally created by flichtenhel=
d. The following approvals got outdated and were remove=
d:
Code-Review+2 by d12fkopenvpnserv: Fix conversion warning=
s in interactive.c
Mostly DWORD vs. size_t conversions where we have=
no
choice but to cast.
Change-Id: I864cd4a718886f437b72e93d0286f=
90fcb73592b
Signed-off-by: Frank Lichtenheld <frank@...2641...>
Acked-by: Heiko Hund <heiko@...515...>
Gerrit URL: https://gerrit=
.openvpn.net/c/openvpn/+/1457
Message-Id: <20260120155547.116088-1-fr=
ank@...2641...>
URL: https://www.mail-archive.com/openvpn-devel@...1697...=
.sourceforge.net/msg35356.html
Signed-off-by: Gert Doering <gert@...1386...=
296...>
---
M src/openvpnserv/interactive.c
1 file changed, 32 =
insertions(+), 26 deletions(-)git pull ssh://ge=
rrit.openvpn.net:29418/openvpn refs/changes/57/1457/6
diff --git a/=
src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
<=
p>To view, visit change 1457. To unsubscribe, or for help writing mail filters=
, visit settings=
.
--- a/src/openvpnserv/inte=
ractive.c
+++ b/src/openvpnserv/interactive.c
return TRUE;
=
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconvers=
ion"
-#endif
+/**
+ * Return correct size for registry value=
to set for string
+ =
*
+ */
+RegWStringSize(PCWSTR string)
<=
span style=3D"color: hsl(120, 100%, 40%);">+{
+ size_t length =3D (wcslen(string) + 1) * size=
of(wchar_t);
+ if =
(length > UINT_MAX)
+ {
+ len=
gth =3D UINT_MAX;
+ =
}
+ return (DWOR=
D)length;
+}
/**
* Prepare DNS domain "=
;SearchList" registry value, so additional
@@ -1413,7 =
+1423,7 @@
return TRUE;
}
- DWO=
RD size =3D (wcslen(list) + 1) * sizeof(*list);
+ DWORD size =3D RegWStringSize(list);=
LSTATUS err =3D RegSetValueExW(key, L"InitialSearchList=
", 0, REG_SZ, (PBYTE)list, size);
if (err)=
{
@@ -1474,7 +1484,7 @@
=
wcsncpy(list, domains, wcslen(domains) + 1);
}
- si=
ze =3D (wcslen(list) + 1) * sizeof(list[0]);
+ size =3D RegWStringSize(list);
err =3D RegSetValueExW(key, L"SearchList", 0, REG_SZ, (PBYT=
E)list, size);
if (err)
{<=
br>@@ -1515,7 +1525,7 @@
goto out;
}
- size =3D (wcslen(list) + 1) * sizeof(list[0]);
err =3D RegSetValueExW(key, L"SearchList", =
0, REG_SZ, (PBYTE)list, size);
if (err)
@@ -1579,14 +1589,14 @@
}=
/* If the search list is back t=
o its initial state reset it */
- if (wcsncmp(list, initial, wcslen(list)) =3D=3D 0)=
+ if (wcsncmp(list, =
initial, list_len) =3D=3D 0)
{
=
ResetDnsSearchDomains(key);
return;<=
/span>
}
}
<=
br>- size =3D (list_len + 1) *=
sizeof(list[0]);
+ =
size =3D RegWStringSize(list);
err =3D RegSetValueEx=
W(key, L"SearchList", 0, REG_SZ, (PBYTE)list, size); if (err)
{
@@ -1751,7 +1761,7=
@@
goto out;
}
- err =3D RegSe=
tValueExA(itf, "NameServer", 0, REG_SZ, (PBYTE)value, strlen(valu=
e) + 1);
+ err =3D=
RegSetValueExA(itf, "NameServer", 0, REG_SZ, (PBYTE)value, (DWOR=
D)strlen(value) + 1);
if (err)
{<=
/span>
MsgToEventLog(M_SYSERR, L"%S: could not set n=
ame servers '%S' for %s family %d (%lu)",
@@ -=
1807,7 +1817,7 @@
int addr_len =3D msg->addr_len;=
span>
/* sanity check */
- const size_t max_addrs =3D _countof(=
msg->addr);
+ c=
onst int max_addrs =3D _countof(msg->addr);
if (add=
r_len > max_addrs)
{
addr_=
len =3D max_addrs;
@@ -1949,7 +1959,7 @@
=
short family =3D families[i];
=
/* Create a comma sparated list of addresses of this family */<=
br>- int offset =3D 0;
+ size_t offset =
=3D 0;
char addr_list[NRPT_ADDR_SIZE * NRPT_ADDR_N=
UM];
for (int j =3D 0; j < NRPT_ADDR_NUM &&=
amp; addresses[j][0]; j++)
{
@@ -2=
085,9 +2095,9 @@
size_t addr=
_len =3D strlen(pos);
pos +=3D addr_len;
- s -=3D addr_len=
;
+ s -=3D=
(DWORD)addr_len;
}
- s =3D strlen(addrs) + 1;
+ s =3D (DWORD)strlen(addrs) + 1;=
}
if (strchr(a=
ddrs, ':'))
@@ -2163,7 +2173,8 @@
=
LSTATUS err =3D ERROR_FILE_NOT_FOUND;
const DWORD buf_size =3D *size;
- const size_t glyph_size =3D sizeof(*domains);
+ const DWORD glyph_size =
=3D sizeof(*domains);
+ const DWORD buf_len =3D buf_size / glyph_size;
P=
WSTR values[] =3D { L"SearchList", L"Domain", L"Dh=
cpDomainSearchList", L"DhcpDomain", NULL };
=
for (int i =3D 0; values[i]; i++)
@@=
-2178,7 +2189,6 @@
* - convert comma separ=
ated list to MULTI_SZ
*/
=
PWCHAR pos =3D domains;
- const DWORD buf_len =3D buf_size / glyph_size;
while (TRUE)
{<=
br> /* Terminate the domain at the next comma */
@@ -2188,9 +2198,9 @@
*com=
ma =3D '\0';
}
=
span>
- size_t =
domain_len =3D wcslen(pos);
- size_t domain_size =3D domain_len * glyph_size;
- size_t conv=
erted_size =3D (pos - domains) * glyph_size;
+ DWORD domain_len =3D (DWORD)wcslen=
(pos);
+ =
DWORD domain_size =3D domain_len * glyph_size;
+ DWORD converted_size =3D (DWO=
RD)(pos - domains) * glyph_size;
=
/* Ignore itf domains which match a pushed search domain */=
if (ListContainsDomain(search_domains, pos, doma=
in_len))
@@ -2216,7 +2226,7 @@
=
domain_size +=3D glyph_size;
=
/* Space for the terminating zeros */
- size_t extra_size =3D 2 * glyph_s=
ize;
+ =
const DWORD extra_size =3D 2 * glyph_size;
if (converted_size + domain_size + extra_size=
> buf_size)
@@ -2450,7 +2460,7 @@
/* Set DNS Server address */
err =3D=
RegSetValueExA(rule_key, "GenericDNSServers", 0, REG_SZ, (PBYTE)=
address,
- =
strlen(address) + 1);
+ (DWORD)strlen(address) + 1);<=
br> if (err)
{
goto=
out;
@@ -2571,7 +2581,7 @@
if (domain=
s[0])
{
size_t domains_len =
=3D strlen(domains);
- =
dom_size =3D domains_len + 2; /* len + the trailing NULs */+ dom_size =3D (DWORD)=
domains_len + 2; /* len + the trailing NULs */
=
wide_domains =3D utf8to16_size(domains, dom_size);
dom_size *=3D sizeof(*wide_domains);
@@ -26=
28,10 +2638,6 @@
return err;
}=
-#if define=
d(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
/**
* Return the registry key where N=
RPT rules are stored
*