From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Wed, 3 Apr 2024 22:22:58 +0000 (+1300)
Subject: ldb: avoid non-transitive comparison in ldb_val_cmp()
X-Git-Tag: tdb-1.4.11~1159
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c36bc82415b246fccec9eae693da82b7aa45b81;p=thirdparty%2Fsamba.git

ldb: avoid non-transitive comparison in ldb_val_cmp()

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15625

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/lib/ldb/common/ldb_msg.c b/lib/ldb/common/ldb_msg.c
index 53f675ed183..9cb26d8bd89 100644
--- a/lib/ldb/common/ldb_msg.c
+++ b/lib/ldb/common/ldb_msg.c
@@ -93,7 +93,7 @@ struct ldb_val *ldb_msg_find_val(const struct ldb_message_element *el,
 static int ldb_val_cmp(const struct ldb_val *v1, const struct ldb_val *v2)
 {
 	if (v1->length != v2->length) {
-		return v1->length - v2->length;
+		return NUMERIC_CMP(v1->length, v2->length);
 	}
 	return memcmp(v1->data, v2->data, v1->length);
 }