From 2682fb541ef9068e9707a3a90c16038e6f516b0f Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Fri, 26 Sep 2025 18:48:39 +0200 Subject: [PATCH] comp-lz4: Fix types in call to LZ4_decompress_safe This is ints all around but we uselessly threw some size_t conversions in there. Change-Id: Ie550dd4df65dc4fc13c839c3e745ba96e0c5c564 Signed-off-by: Frank Lichtenheld Acked-by: MaxF Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1215 Message-Id: <20250926164845.1215-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg33228.html Signed-off-by: Gert Doering --- src/openvpn/comp-lz4.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/openvpn/comp-lz4.c b/src/openvpn/comp-lz4.c index a78c664f0..53a5b3f6f 100644 --- a/src/openvpn/comp-lz4.c +++ b/src/openvpn/comp-lz4.c @@ -88,19 +88,13 @@ lz4v2_compress(struct buffer *buf, struct buffer work, struct compress_context * compv2_escape_data_ifneeded(buf); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - static void -do_lz4_decompress(size_t zlen_max, struct buffer *work, struct buffer *buf, +do_lz4_decompress(int zlen_max, struct buffer *work, struct buffer *buf, struct compress_context *compctx) { - int uncomp_len; ASSERT(buf_safe(work, zlen_max)); - uncomp_len = LZ4_decompress_safe((const char *)BPTR(buf), (char *)BPTR(work), (size_t)BLEN(buf), - zlen_max); + int uncomp_len = LZ4_decompress_safe((const char *)BPTR(buf), (char *)BPTR(work), BLEN(buf), + zlen_max); if (uncomp_len <= 0) { dmsg(D_COMP_ERRORS, "LZ4 decompression error: %d", uncomp_len); @@ -118,15 +112,11 @@ do_lz4_decompress(size_t zlen_max, struct buffer *work, struct buffer *buf, *buf = *work; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - static void lz4_decompress(struct buffer *buf, struct buffer work, struct compress_context *compctx, const struct frame *frame) { - size_t zlen_max = frame->buf.payload_size; + int zlen_max = frame->buf.payload_size; uint8_t c; /* flag indicating whether or not our peer compressed */ if (buf->len <= 0) @@ -163,7 +153,7 @@ static void lz4v2_decompress(struct buffer *buf, struct buffer work, struct compress_context *compctx, const struct frame *frame) { - size_t zlen_max = frame->buf.payload_size; + int zlen_max = frame->buf.payload_size; uint8_t c; /* flag indicating whether or not our peer compressed */ if (buf->len <= 0) -- 2.47.3