upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-05-28 04:03:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

buffer: Fix some issues with -DVERIFY_ALIGNMENT

Browse source 
- Fix some uninitalised fields due to BUF_INIT_TRACKING
  (found by cppcheck and the original reason for this
   change).
- Fix "unused functions" if only BUF_INIT_TRACKING is
  defined.
- Fix conversion error

Change-Id: I3ecb76d9022dcd7dae92eb5e9d62e5f018744883
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1666
Message-Id: <20260513092251.28857-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36901.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Frank Lichtenheld 2026-05-13 11:22:45 +02:00 committed by Gert Doering
parent 50bcb9206b
commit b6f09d0151
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/openvpn/buffer.c
View file

@ -64,14 +64,13 @@ alloc_buf(size_t size)
#endif
{
struct buffer buf;
CLEAR(buf);
if (!buf_size_valid(size))
{
buf_size_error(size);
}
buf.capacity = (int)size;
buf.offset = 0;
buf.len = 0;
#ifdef DMALLOC
buf.data = openvpn_dmalloc(file, line, size);
#else
@ -90,13 +89,13 @@ alloc_buf_gc(size_t size, struct gc_arena *gc)
#endif
{
struct buffer buf;
CLEAR(buf);
if (!buf_size_valid(size))
{
buf_size_error(size);
}
buf.capacity = (int)size;
buf.offset = 0;
buf.len = 0;
#ifdef DMALLOC
buf.data = (uint8_t *)gc_malloc_debug(size, false, gc, file, line);
#else
@ -120,6 +119,10 @@ clone_buf(const struct buffer *buf)
ret.capacity = buf->capacity;
ret.offset = buf->offset;
ret.len = buf->len;
#ifdef BUF_INIT_TRACKING
ret.debug_file = buf->debug_file;
ret.debug_line = buf->debug_line;
#endif
#ifdef DMALLOC
ret.data = (uint8_t *)openvpn_dmalloc(file, line, buf->capacity);
#else
@ -140,6 +143,7 @@ buf_init_debug(struct buffer *buf, int offset, const char *file, int line)
return buf_init_dowork(buf, offset);
}
#ifdef VERIFY_ALIGNMENT
static inline int
buf_debug_line(const struct buffer *buf)
{
@ -151,6 +155,7 @@ buf_debug_file(const struct buffer *buf)
{
return buf->debug_file;
}
#endif
#else /* ifdef BUF_INIT_TRACKING */
@ -1152,7 +1157,7 @@ valign4(const struct buffer *buf, const char *file, const int line)
if (buf && buf->len)
{
msglvl_t msglevel = D_ALIGN_DEBUG;
const unsigned int u = (unsigned int)BPTR(buf);
const uintptr_t u = (uintptr_t)BPTR(buf);
if (u & (PAYLOAD_ALIGN - 1))
{