upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-02-18 18:19:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Silence compiler truncation warning by checking snprintf return value

Browse source 
On the more recent mingw compilers (homebrew mingw 13.0.0, GCC 15.2.0) the
compiler complains about a potential truncation in these two places.

  src/openvpn/tun.c:3806:57:
  error: '%s' directive output may be truncated writing up
  to 255 bytes into a region of size 178
  [-Werror=format-truncation=]

This not very helpful but checking the snprintf return value
will make the compiler not warn about this.

Change-Id: I54b11a5540fb236580a3b80c6d1e8678b24bd852
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1272
Message-Id: <20260121121830.27244-1-frank@lichtenheld.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg35367.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Arne Schwabe 2026-01-21 13:18:30 +01:00 committed by Gert Doering
parent 1a31efb495
commit 1fe958183f
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/openvpn/tun.c
View file

@ -3558,7 +3558,13 @@ get_tap_reg(struct gc_arena *gc)
msg(M_FATAL, "Error enumerating registry subkeys of key: %s", ADAPTER_KEY);
}
snprintf(unit_string, sizeof(unit_string), "%s\\%s", ADAPTER_KEY, enum_name);
int ret = snprintf(unit_string, sizeof(unit_string), "%s\\%s", ADAPTER_KEY, enum_name);
if (ret < 0 || ret >= sizeof(unit_string))
{
msg(M_WARN, "Error constructing unit string for %s", enum_name);
continue;
}
status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, unit_string, 0, KEY_READ, &unit_key);
@ -3667,8 +3673,15 @@ get_panel_reg(struct gc_arena *gc)
msg(M_FATAL, "Error enumerating registry subkeys of key: %s", NETWORK_CONNECTIONS_KEY);
}
snprintf(connection_string, sizeof(connection_string), "%s\\%s\\Connection",
NETWORK_CONNECTIONS_KEY, enum_name);
int ret = snprintf(connection_string, sizeof(connection_string), "%s\\%s\\Connection",
NETWORK_CONNECTIONS_KEY, enum_name);
if (ret < 0 || ret >= sizeof(connection_string))
{
msg(M_WARN, "Error constructing connection string for %s", enum_name);
continue;
}
status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, connection_string, 0, KEY_READ, &connection_key);