From: Alan T. DeKok <aland@freeradius.org>
Date: Sat, 11 Jun 2022 22:11:39 +0000 (-0400)
Subject: on dup, increment both
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13cea4f1d03566bf4a5005043dffe20888752201;p=thirdparty%2Ffreeradius-server.git

on dup, increment both
---

diff --git a/src/lib/util/sbuff.c b/src/lib/util/sbuff.c
index b590e567ab3..bf4313250b3 100644
--- a/src/lib/util/sbuff.c
+++ b/src/lib/util/sbuff.c
@@ -616,9 +616,14 @@ fr_sbuff_term_t *fr_sbuff_terminals_amerge(TALLOC_CTX *ctx, fr_sbuff_term_t cons
 		int8_t cmp;
 
 		cmp = terminal_cmp(&a->elem[i], &b->elem[j]);
-		if (cmp <= 0) {
+		if (cmp == 0) {
+			j++;
 			tmp[num++] = &a->elem[i++];
-		} else {
+
+		} else if (cmp < 0) {
+			tmp[num++] = &a->elem[i++];
+
+		} else if (cmp > 0) {
 			tmp[num++] = &b->elem[j++];
 		}