From: "flichtenheld (Code Review)"
Date: Fri, 9 Jan 2026 12:54:42 +0000
In-Reply-To:
References:
Reply-To: frank@...2641..., arne-openvpn@...1227..., heiko@...515...,
openvpn-devel@lists.sourceforge.net, gert@...1296...
Message-ID:
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="VzGrFm9mjHw="; charset=UTF-8
Subject: [Openvpn-devel] [M] Change in openvpn[master]: openvpnserv: Fix
conversion warnings in interactive.c
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: plaisthos , d12fk
Cc: openvpn-devel
--VzGrFm9mjHw=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: cron2, d12fk, flichtenheld, plaisthos.
Hello cron2, d12fk, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1457?usp=3Demail
to look at the new patch set (#4).
The following approvals got outdated and were removed:
Code-Review-1 by cron2
Change subject: openvpnserv: Fix conversion warnings in interactive.c
......................................................................
openvpnserv: Fix conversion warnings in interactive.c
Mostly DWORD vs. size_t conversions where we have no
choice but to cast.
Change-Id: I864cd4a718886f437b72e93d0286f90fcb73592b
Signed-off-by: Frank Lichtenheld
---
M src/openvpnserv/interactive.c
1 file changed, 32 insertions(+), 26 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/57/1457/4
diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
index aa7da00..b53207bc 100644
--- a/src/openvpnserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -1383,10 +1383,20 @@
return TRUE;
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
+/**
+ * Return correct length for regex value to set for string
+ *
+ */
+static DWORD
+RegWStringSize(PCWSTR string)
+{
+ size_t length =3D (wcslen(string) + 1) * sizeof(wchar_t);
+ if (length > UINT_MAX)
+ {
+ length =3D UINT_MAX;
+ }
+ return (DWORD)length;
+}
/**
* Prepare DNS domain "SearchList" registry value, so additional
@@ -1413,7 +1423,7 @@
return TRUE;
}
- DWORD 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);
}
- size =3D (wcslen(list) + 1) * sizeof(list[0]);
+ size =3D RegWStringSize(list);
err =3D RegSetValueExW(key, L"SearchList", 0, REG_SZ, (PBYTE)list, siz=
e);
if (err)
{
@@ -1515,7 +1525,7 @@
goto out;
}
- size =3D (wcslen(list) + 1) * sizeof(list[0]);
+ size =3D RegWStringSize(list);
err =3D RegSetValueExW(key, L"SearchList", 0, REG_SZ, (PBYTE)list, siz=
e);
if (err)
{
@@ -1579,14 +1589,14 @@
}
/* If the search list is back to 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;
}
}
- size =3D (list_len + 1) * sizeof(list[0]);
+ size =3D RegWStringSize(list);
err =3D RegSetValueExW(key, L"SearchList", 0, REG_SZ, (PBYTE)list, siz=
e);
if (err)
{
@@ -1751,7 +1761,7 @@
goto out;
}
- err =3D RegSetValueExA(itf, "NameServer", 0, REG_SZ, (PBYTE)value, str=
len(value) + 1);
+ err =3D RegSetValueExA(itf, "NameServer", 0, REG_SZ, (PBYTE)value, (DW=
ORD)strlen(value) + 1);
if (err)
{
MsgToEventLog(M_SYSERR, L"%S: could not set name servers '%S' for =
%s family %d (%lu)",
@@ -1807,7 +1817,7 @@
int addr_len =3D msg->addr_len;
/* sanity check */
- const size_t max_addrs =3D _countof(msg->addr);
+ const int max_addrs =3D _countof(msg->addr);
if (addr_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 */
- int offset =3D 0;
+ size_t offset =3D 0;
char addr_list[NRPT_ADDR_SIZE * NRPT_ADDR_NUM];
for (int j =3D 0; j < NRPT_ADDR_NUM && addresses[j][0]; j++)
{
@@ -2085,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(addrs, ':'))
@@ -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;
PWSTR values[] =3D { L"SearchList", L"Domain", L"DhcpDomainSearchList"=
, L"DhcpDomain", NULL };
for (int i =3D 0; values[i]; i++)
@@ -2178,7 +2189,6 @@
* - convert comma separated list to MULTI_SZ
*/
PWCHAR pos =3D domains;
- const DWORD buf_len =3D buf_size / glyph_size;
while (TRUE)
{
/* Terminate the domain at the next comma */
@@ -2188,9 +2198,9 @@
*comma =3D '\0';
}
- size_t domain_len =3D wcslen(pos);
- size_t domain_size =3D domain_len * glyph_size;
- size_t converted_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 (DWORD)(pos - domains) * glyph_si=
ze;
/* Ignore itf domains which match a pushed search domain */
if (ListContainsDomain(search_domains, pos, domain_len))
@@ -2216,7 +2226,7 @@
domain_size +=3D glyph_size;
/* Space for the terminating zeros */
- size_t extra_size =3D 2 * glyph_size;
+ const DWORD extra_size =3D 2 * glyph_size;
/* Check for enough space to convert this domain */
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, (PBYT=
E)address,
- strlen(address) + 1);
+ (DWORD)strlen(address) + 1);
if (err)
{
goto out;
@@ -2571,7 +2581,7 @@
if (domains[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);
@@ -2628,10 +2638,6 @@
return err;
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
/**
* Return the registry key where NRPT rules are stored
*
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1457?usp=3Demail
To unsubscribe, or for help writing mail filters, visit http://gerrit.openv=
pn.net/settings?usp=3Demail
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I864cd4a718886f437b72e93d0286f90fcb73592b
Gerrit-Change-Number: 1457
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld
Gerrit-Reviewer: cron2
Gerrit-Reviewer: d12fk
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
Gerrit-Attention: plaisthos
Gerrit-Attention: cron2
Gerrit-Attention: flichtenheld
Gerrit-Attention: d12fk
--VzGrFm9mjHw=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is cur=
rently required from: cron2, d12fk, flichtenheld, plaisthos.
flichtenheld uploaded patch set #4 to this change.
<=
p>View C=
hange
The following approvals got outdated and were removed:
Code-Review-1 by cron2
openvpnserv: 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...>
---
M src/openvpnserv/interactive.c
1 file changed, 32 insertions(+)=
, 26 deletions(-)
git pull ssh://gerrit.openvpn.=
net:29418/openvpn refs/changes/57/1457/4
diff --git a/src/openvpnse=
rv/interactive.c b/src/openvpnserv/interactive.c
index aa7d=
a00..b53207bc 100644
--- a/src/openvpnserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -1383,=
10 +1383,20 @@
return TRUE;
}<=
br>
-#if defined=
(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
+/**
+ * Return correct length for regex value to set for s=
tring
+ *
<=
span style=3D"color: hsl(120, 100%, 40%);">+ */
+static DWORD
+RegWStringSize(PCWSTR string)
+{
+ size_t length =3D (wcslen(string) + 1) * sizeof(wchar_t);<=
/span>
+ if (length > =
UINT_MAX)
+ {
+ length =3D UINT_=
MAX;
+ }
+ return (DWORD)length;
+}
/**
* Prepare DNS domain "SearchList&q=
uot; registry value, so additional
@@ -1413,7 +1423,7 @@
return TRUE;
}
=
- DWORD size =3D (=
wcslen(list) + 1) * sizeof(*list);
+ DWORD size =3D RegWStringSize(list);
=
LSTATUS err =3D RegSetValueExW(key, L"InitialSearchList", 0, RE=
G_SZ, (PBYTE)list, size);
if (err)
=
{
@@ -1474,7 +1484,7 @@
wcsncpy(=
list, domains, wcslen(domains) + 1);
}
- size =3D (wcsle=
n(list) + 1) * sizeof(list[0]);
+ size =3D RegWStringSize(list);
err =3D=
RegSetValueExW(key, L"SearchList", 0, REG_SZ, (PBYTE)list, size)=
;
if (err)
{
@@ -=
1515,7 +1525,7 @@
goto out;
}=
- =
size =3D (wcslen(list) + 1) * sizeof(list[0]);
+ size =3D RegWStringSize(list);
err =3D RegSetValueExW(key, L"SearchList", 0, REG_SZ, (P=
BYTE)list, size);
if (err)
{
@@ -1579,14 +1589,14 @@
}
/* If the search list is back to its initial=
state reset it */
- =
if (wcsncmp(list, initial, wcslen(list)) =3D=3D 0)
+ if (wcsncmp(list, initial, list=
_len) =3D=3D 0)
{
Res=
etDnsSearchDomains(key);
return;
}
}
- size =3D (list_len + 1) * sizeof(list[=
0]);
+ size =3D Re=
gWStringSize(list);
err =3D RegSetValueExW(key, L"=
;SearchList", 0, REG_SZ, (PBYTE)list, size);
if (=
err)
{
@@ -1751,7 +1761,7 @@
goto out;
}
- err =3D RegSetValueExA(itf=
, "NameServer", 0, REG_SZ, (PBYTE)value, strlen(value) + 1);
+ err =3D RegSetValueE=
xA(itf, "NameServer", 0, REG_SZ, (PBYTE)value, (DWORD)strlen(valu=
e) + 1);
if (err)
{
MsgToEventLog(M_SYSERR, L"%S: could not set name servers &=
#39;%S' for %s family %d (%lu)",
@@ -1807,7 +1817,=
7 @@
int addr_len =3D msg->addr_len;
/* sanity check */
- const size_t max_addrs =3D _countof(msg->addr)=
;
+ const int max_=
addrs =3D _countof(msg->addr);
if (addr_len > ma=
x_addrs)
{
addr_len =3D max_a=
ddrs;
@@ -1949,7 +1959,7 @@
short =
family =3D families[i];
/* Creat=
e a comma sparated list of addresses of this family */
- int offset =3D 0;
+ size_t offset =3D 0;<=
br> char addr_list[NRPT_ADDR_SIZE * NRPT_ADDR_NUM];
for (int j =3D 0; j < NRPT_ADDR_NUM && addresses=
[j][0]; j++)
{
@@ -2085,9 +2095,9 =
@@
size_t addr_len =3D strle=
n(pos);
pos +=3D addr_len;
- s -=3D addr_len;
+ s -=3D (DWORD)addr_l=
en;
}
- s =3D strlen(addrs) + 1;
+ s =3D (DWORD)strlen(addrs) + 1;
}
if (strchr(addrs, ':=
39;))
@@ -2163,7 +2173,8 @@
LSTATUS err =3D ERROR_FILE_NOT_FOUND;
const DW=
ORD buf_size =3D *size;
- const size_t glyph_size =3D sizeof(*domains);
+ const DWORD glyph_size =3D sizeof(*do=
mains);
+ const DW=
ORD buf_len =3D buf_size / glyph_size;
PWSTR values[] =
=3D { L"SearchList", L"Domain", L"DhcpDomainSearch=
List", L"DhcpDomain", NULL };
for (int i =3D 0; values[i]; i++)
@@ -2178,7 +2189=
,6 @@
* - convert comma separated list to M=
ULTI_SZ
*/
PWCHA=
R pos =3D domains;
- =
const DWORD buf_len =3D buf_size / glyph_size;
=
while (TRUE)
{
=
/* Terminate the domain at the next comma */
@@=
-2188,9 +2198,9 @@
*comma =3D '\0=
';
}
- size_t domain_len =3D=
wcslen(pos);
- =
size_t domain_size =3D domain_len * glyph_size;
- size_t converted_size =3D=
(pos - domains) * glyph_size;
+ DWORD domain_len =3D (DWORD)wcslen(pos);<=
br>+ DWORD domai=
n_size =3D domain_len * glyph_size;
+ DWORD converted_size =3D (DWORD)(pos - doma=
ins) * glyph_size;
/* Ig=
nore itf domains which match a pushed search domain */
=
if (ListContainsDomain(search_domains, pos, domain_len))
@@ -2216,7 +2226,7 @@
domain_si=
ze +=3D glyph_size;
/* S=
pace for the terminating zeros */
- size_t extra_size =3D 2 * glyph_size;
+ const DWORD e=
xtra_size =3D 2 * glyph_size;
=
/* Check for enough space to convert this domain */
=
if (converted_size + domain_size + extra_size > buf_size=
)
@@ -2450,7 +2460,7 @@
=
/* Set DNS Server address */
err =3D RegSetValueEx=
A(rule_key, "GenericDNSServers", 0, REG_SZ, (PBYTE)address,
- st=
rlen(address) + 1);
+=
(DWORD)strlen(address) + 1);
=
if (err)
{
goto out;@@ -2571,7 +2581,7 @@
if (domains[0]) {
size_t domains_len =3D strlen(domai=
ns);
- dom_size =
=3D domains_len + 2; /* len + the trailing NULs */
+ dom_size =3D (DWORD)domains_len + 2;=
/* len + the trailing NULs */
w=
ide_domains =3D utf8to16_size(domains, dom_size);
=
dom_size *=3D sizeof(*wide_domains);
@@ -2628,10 +2638,6 @@=
return err;
}
-#if defined(__GNUC__) || d=
efined(__clang__)
-#pra=
gma GCC diagnostic pop
=
-#endif
-
/**
* Return the registry key where NRPT rules are st=
ored
*
To view, visit=
change =
1457. To unsubscribe, or for help writing mail filters, visit settings.
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I864cd4a718886f437b72e93d028=
6f90fcb73592b
Gerrit-Change-Number: 1457
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld <frank@...2723...=
.>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: d12fk <heiko@...515...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...=
.1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...=
ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...=
..1227...>
Gerrit-Attention: cron2 <gert@...1296...>=
;
Gerrit-Attention: flichtenheld <frank@...2375...=
41...>
Gerrit-Attention: d12fk <heiko@...515...>=
;
=
--VzGrFm9mjHw=--