s3:lib:util_tdb: use NUMERIC_CMP() in tdb_data_cmp()
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Thu, 4 Apr 2024 01:01:24 +0000 (14:01 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 10 Apr 2024 22:56:33 +0000 (22:56 +0000)
Although these are size_t, in practice TDB data is limited to 32 bit.
Even so, overflow of a signed int is possible.

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>
source3/lib/util_tdb.c

index d85f676fbcf82bf44a5fbd177fa66a3f6be1068d..3c7c1945f58c9a85b702cfed00b21522030e673e 100644 (file)
@@ -324,11 +324,11 @@ int tdb_data_cmp(TDB_DATA t1, TDB_DATA t2)
                return 1;
        }
        if (t1.dptr == t2.dptr) {
-               return t1.dsize - t2.dsize;
+               return NUMERIC_CMP(t1.dsize, t2.dsize);
        }
        ret = memcmp(t1.dptr, t2.dptr, MIN(t1.dsize, t2.dsize));
        if (ret == 0) {
-               return t1.dsize - t2.dsize;
+               return NUMERIC_CMP(t1.dsize, t2.dsize);
        }
        return ret;
 }