From: "flichtenheld (Code Review)" Date: Wed, 7 Jan 2026 17:58:05 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="WsNZUS/CitM="; 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 Cc: openvpn-devel --WsNZUS/CitM= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/1457?usp=3Demail to review the following change. 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, 37 insertions(+), 31 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/57/1457/1 diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 9327dfa..8b418ce 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 +RegWStringLength(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 RegWStringLength(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 RegWStringLength(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 RegWStringLength(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 RegWStringLength(list); err =3D RegSetValueExW(key, L"SearchList", 0, REG_SZ, (PBYTE)list, siz= e); if (err) { @@ -1729,9 +1739,9 @@ * @param family internet address family to set the servers for * @param value the value to set the name servers to * - * @return DWORD NO_ERROR on success, a Windows error code otherwise + * @return NO_ERROR on success, a Windows error code otherwise */ -static DWORD +static LSTATUS SetNameServersValue(PCWSTR itf_id, short family, PCSTR value) { DWORD 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)", @@ -1777,9 +1787,9 @@ * @param family internet address family to set the servers for * @param addrs comma separated list of name server addresses * - * @return DWORD NO_ERROR on success, a Windows error code otherwise + * @return NO_ERROR on success, a Windows error code otherwise */ -static DWORD +static LSTATUS SetNameServers(PCWSTR itf_id, short family, PCSTR addrs) { return SetNameServersValue(itf_id, family, addrs); @@ -1793,7 +1803,7 @@ * * @return DWORD NO_ERROR on success, a Windows error code otherwise */ -static DWORD +static LSTATUS ResetNameServers(PCWSTR itf_id, short family) { return SetNameServersValue(itf_id, family, ""); @@ -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; =20 /* 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: newchange Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I864cd4a718886f437b72e93d0286f90fcb73592b Gerrit-Change-Number: 1457 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --WsNZUS/CitM= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

V= iew Change

openvpnserv: Fix conversion warnings in int=
eractive.c

Mostly DWORD vs. size_t conversions where we have no
c= hoice but to cast.

Change-Id: I864cd4a718886f437b72e93d0286f90fcb735= 92b
Signed-off-by: Frank Lichtenheld <frank@...2641...>
---
= M src/openvpnserv/interactive.c
1 file changed, 37 insertions(+), 31 del= etions(-)

git pull ssh://gerrit.openvpn.net:2941=
8/openvpn refs/changes/57/1457/1
diff --git a/src/openvpnserv/inter=
active.c b/src/openvpnserv/interactive.c
index 9327dfa..8b4= 18ce 100644
--- a/src/openvpnserv/interactive.c
<= span>+++ 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"
<= span style=3D"color: hsl(0, 100%, 40%);">-#endif
+/**
+ * Return correct length for regex value to set for string
+ *
+ */
+static DWORD
+RegWStringLength(PCWSTR string)
+{
+ size_t length =3D (wcslen(string) + 1) * sizeof(wchar_t);<= br>+ if (length > UINT_MA= X)
+ {
<= span style=3D"color: hsl(120, 100%, 40%);">+ length =3D UINT_MAX;
+ }
+ return (DWORD)length;
= +}

= /**
* Prepare DNS domain "SearchList" re= gistry value, so additional
@@ -1413,7 +1423,7 @@ return TRUE;
}

- DWORD size =3D (wcslen(= list) + 1) * sizeof(*list);
+ DWORD size =3D RegWStringLength(list);
LST= ATUS 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(lis= t) + 1) * sizeof(list[0]);
+ size =3D RegWStringLength(list);
err =3D Re= gSetValueExW(key, L"SearchList", 0, REG_SZ, (PBYTE)list, size);
if (err)
{
@@ -151= 5,7 +1525,7 @@
goto out;
}

- si= ze =3D (wcslen(list) + 1) * sizeof(list[0]);
+ size =3D RegWStringLength(list);
err =3D RegSetValueExW(key, L"SearchList", 0, REG_SZ, (PB= YTE)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)
{
Rese= tDnsSearchDomains(key);
return;
}

}

- size =3D (list_len + 1) * sizeof(list[0= ]);
+ size =3D Reg= WStringLength(list);
err =3D RegSetValueExW(key, L&quo= t;SearchList", 0, REG_SZ, (PBYTE)list, size);
if = (err)
{
@@ -1729,9 +1739,9 @@ * @param family internet address family to set the servers for=
* @param value the value to set the name servers to<= /span>
*
- *= @return DWORD NO_ERROR on success, a Windows error code otherwise+ * @return NO_ERROR on succe= ss, a Windows error code otherwise
*/
-static DWORD
+static LSTATUS
SetNameServersVa= lue(PCWSTR itf_id, short family, PCSTR value)
{
= DWORD err;
@@ -1751,7 +1761,7 @@
goto out;

}

- err =3D RegSetValueExA(itf, &quo= t;NameServer", 0, REG_SZ, (PBYTE)value, strlen(value) + 1);

= + err =3D RegSetValueExA(itf= , "NameServer", 0, REG_SZ, (PBYTE)value, (DWORD)strlen(value) + 1= );
if (err)
{
= MsgToEventLog(M_SYSERR, L"%S: could not set name servers '%S= ' for %s family %d (%lu)",
@@ -1777,9 +1787,9 @@
* @param family internet address family to set the serv= ers for
* @param addrs comma separated list of name s= erver addresses
*
- * @return DWORD NO_ERROR on success, a Windows error code ot= herwise
+ * @return N= O_ERROR on success, a Windows error code otherwise
*/
-static DWORD
+static LSTATUS

= SetNameServers(PCWSTR itf_id, short family, PCSTR addrs)
{=
return SetNameServersValue(itf_id, family, addrs);
@@ -1793,7 +1803,7 @@
*
*= @return DWORD NO_ERROR on success, a Windows error code otherwise */
-static DW= ORD
+static LSTATUS
ResetNameServers(PCWSTR itf_id, short family)
{

return SetNameServersValue(itf_id, family, "= ;");
@@ -1807,7 +1817,7 @@
int ad= dr_len =3D msg->addr_len;

/* sani= ty check */
- const = size_t max_addrs =3D _countof(msg->addr);
+ const int max_addrs =3D _countof(msg->addr)= ;
if (addr_len > max_addrs)
{<= /span>
addr_len =3D max_addrs;
@@ -1949,7= +1959,7 @@
short family =3D families[i];
/* Create a comma sparated list of addre= sses 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 @@

<= span> size_t addr_len =3D strlen(pos);

= pos +=3D addr_len;
- s -=3D addr_len;
+ s -=3D (DWORD)addr_len;
}
- s =3D strlen(ad= drs) + 1;
+ s = =3D (DWORD)strlen(addrs) + 1;
}

if (strchr(addrs, ':'))
@@ -2163,7= +2173,8 @@

LSTATUS err =3D ERROR_FI= LE_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&qu= ot;, NULL };

for (int i =3D 0; value= s[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 dom= ain at the next comma */
@@ -2188,9 +2198,9 @@
*comma =3D '\0';

= }

- size_t domain_len =3D wcslen(pos);
- size_t domain_size =3D d= omain_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_si= ze;
+ = DWORD converted_size =3D (DWORD)(pos - domains) * glyph_size;

/* Ignore itf domains which match a p= ushed search domain */
if (ListContainsDom= ain(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_si= ze + domain_size + extra_size > buf_size)
@@ -2450,7 +24= 60,7 @@

/* Set DNS Server address */=
err =3D RegSetValueExA(rule_key, "GenericDNSServ= ers", 0, REG_SZ, (PBYTE)address,
- strlen(address) + 1);
+ (DWORD)= strlen(address) + 1);

if (err)
{<= /span>
goto out;
@@ -2571,7 +2581,7 @@
if (domains[0])
{
= size_t domains_len =3D strlen(domains);
- dom_size =3D domains_len + 2; /* len + th= e trailing NULs */
+ = dom_size =3D (DWORD)domains_len + 2; /* len + the trailing NULs */

wide_domains =3D utf8to16_size(do= mains, dom_size);
dom_size *=3D sizeof(*wide_domai= ns);
@@ -2628,10 +2638,6 @@
return err= ;
}

-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
/**
* Retu= rn the registry key where NRPT rules are stored
*<= br>

To view, visit change 1457. To unsubscribe, or for= help writing mail filters, visit settings.

Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I864cd4a718886f437b72e93d028= 6f90fcb73592b
Gerrit-Change-Number: 1457
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
= --WsNZUS/CitM=--