oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

krb5: Make krb5_data_cmp() be good for sorting

Browse Source 
The doc comment says it's good for sorting, but it wasn't really.  Now
it should be.
This commit is contained in:
Nicolas Williams
2022-01-17 15:11:14 -06:00
parent 4b7ad8ee43
commit b6114c5492
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/krb5/data.c
View File

@@ -200,9 +200,12 @@ krb5_copy_data(krb5_context context,
KRB5_LIB_FUNCTION int KRB5_LIB_CALL KRB5_LIB_FUNCTION int KRB5_LIB_CALL
krb5_data_cmp(const krb5_data *data1, const krb5_data *data2) krb5_data_cmp(const krb5_data *data1, const krb5_data *data2)
{ {
if (data1->length != data2->length) size_t len = data1->length < data2->length ? data1->length : data2->length;
int cmp = memcmp(data1->data, data2->data, len);
if (cmp == 0)
return data1->length - data2->length; return data1->length - data2->length;
return memcmp(data1->data, data2->data, data1->length); return cmp;
} }
/** /**