From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 19 Oct 2020 17:29:33 +0000 (-0400)
Subject: fr_dbuff_extend_lowat() returns a length, it never returns 0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b31cd29288bd8cfbdc136faa0ebeddf7085eff8;p=thirdparty%2Ffreeradius-server.git

fr_dbuff_extend_lowat() returns a length, it never returns 0
---

diff --git a/src/lib/util/dbuff.h b/src/lib/util/dbuff.h
index 2124bed598e..93dce277b58 100644
--- a/src/lib/util/dbuff.h
+++ b/src/lib/util/dbuff.h
@@ -847,7 +847,7 @@ static inline size_t _fr_dbuff_memcpy_in_partial(fr_dbuff_t *dbuff, uint8_t cons
 {
 	fr_assert(!dbuff->is_const);
 
-	if (fr_dbuff_extend_lowat(NULL, dbuff, inlen) == 0) inlen = fr_dbuff_remaining(dbuff);
+	if (fr_dbuff_extend_lowat(NULL, dbuff, inlen) < inlen) inlen = fr_dbuff_remaining(dbuff);
 
 	memcpy(dbuff->p, in, inlen);
 
@@ -860,7 +860,7 @@ static inline size_t _fr_dbuff_memcpy_in_dbuff_partial(fr_dbuff_t *dbuff, fr_dbu
 
 	if (inlen > fr_dbuff_remaining(in)) inlen = fr_dbuff_remaining(in);
 
-	if (fr_dbuff_extend_lowat(NULL, dbuff, inlen) == 0) inlen = fr_dbuff_remaining(dbuff);
+	if (fr_dbuff_extend_lowat(NULL, dbuff, inlen) < inlen) inlen = fr_dbuff_remaining(dbuff);
 
 	(void)_fr_dbuff_memcpy_in(dbuff, in->p, inlen);