From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 23 Oct 2019 12:57:00 +0000 (-0400)
Subject: fix up memcpy_bounded()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7af014b5291eae0a260bce77947da6ac59fc0dcf;p=thirdparty%2Ffreeradius-server.git

fix up memcpy_bounded()
---

diff --git a/src/protocols/radius/decode.c b/src/protocols/radius/decode.c
index c7295466124..0bde13fa40c 100644
--- a/src/protocols/radius/decode.c
+++ b/src/protocols/radius/decode.c
@@ -38,10 +38,12 @@ static void memcpy_bounded(void * restrict dst, const void * restrict src, size_
 		return;
 	}
 
-	if (!fr_cond_assert(src < end)) {
+	if (!fr_cond_assert(src <= end)) {
 		return;
 	}
 
+	if (len == 0) return;
+
 	if (!fr_cond_assert(((uint8_t const * restrict) src + len) <= (uint8_t const * restrict) end)) {
 		len = (uint8_t const * restrict) end - (uint8_t const * restrict) src;
 	}