From 2183683bd633818dd031b090b5530951de76f392 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 11 Feb 2015 10:27:57 +0100 Subject: Use inline functions to convert buffer data to scalars. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * common/host2net.h (buf16_to_ulong, buf16_to_uint): New. (buf16_to_ushort, buf16_to_u16): New. (buf32_to_size_t, buf32_to_ulong, buf32_to_uint, buf32_to_u32): New. -- Commit 91b826a38880fd8a989318585eb502582636ddd8 was not enough to avoid all sign extension on shift problems. Hanno Böck found a case with an invalid read due to this problem. To fix that once and for all almost all uses of "<< 24" and "<< 8" are changed by this patch to use an inline function from host2net.h. Signed-off-by: Werner Koch --- common/tlv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/tlv.c') diff --git a/common/tlv.c b/common/tlv.c index 51a0907c3..74cb4a744 100644 --- a/common/tlv.c +++ b/common/tlv.c @@ -96,7 +96,7 @@ do_find_tlv (const unsigned char *buffer, size_t length, { /* Two byte length follows. */ if (n < 2) return NULL; /* We expected 2 more bytes with the length. */ - len = (s[0] << 8) | s[1]; + len = ((size_t)s[0] << 8) | s[1]; s += 2; n -= 2; } else -- cgit v1.2.3