[Openvpn-devel,XS] Change in openvpn[release/2.6]: buffer: use memcpy in buf_catrunc

Message ID d7b6927717998457359ab0517697ddb1650b3424-HTML@gerrit.openvpn.net
State Not Applicable
Headers show
Series [Openvpn-devel,XS] Change in openvpn[release/2.6]: buffer: use memcpy in buf_catrunc | expand

Commit Message

plaisthos (Code Review) July 21, 2023, 1:55 p.m. UTC
flichtenheld has uploaded this change for review. ( http://gerrit.openvpn.net/c/openvpn/+/314?usp=email )

Change subject: buffer: use memcpy in buf_catrunc

buffer: use memcpy in buf_catrunc

Since we use strlen() to determine the length
and then check it ourselves, there is really
no point in using strncpy.

But the compiler might complain that we use
the output of strlen() for the length of
strncpy which is usually a sign for bugs:

error: ‘strncpy’ specified bound depends
 on the length of the source argument

Warning was at least triggered for
mingw-gcc version 10-win32 20220113.

Also change the type of len to size_t
which avoids potential problems with
signed overflow.

 - make len size_t and change code to avoid any theoretical overflows
 - remove useless casts
 - fix off-by-one introduced by v2 %)
 - ignore unsigned overflow to simplify code

Change-Id: If4a67adac4d2e870fd719b58075d39efcd67c671
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit c89a97e449baaf60924a362555d35184f188a646)
M src/openvpn/buffer.c
1 file changed, 2 insertions(+), 2 deletions(-)

  git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/14/314/1


diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c
index d099795..7725438 100644
--- a/src/openvpn/buffer.c
+++ b/src/openvpn/buffer.c
@@ -316,10 +316,10 @@ 
     if (buf_forward_capacity(buf) <= 1)
-        int len = (int) strlen(str) + 1;
+        size_t len = strlen(str) + 1;
         if (len < buf_forward_capacity_total(buf))
-            strncpynt((char *)(buf->data + buf->capacity - len), str, len);
+            memcpy(buf->data + buf->capacity - len, str, len);