sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

ldb: avoid NULL deref in ldb_db_compare

Browse Source 
This also sorts NULLs after invalid DNs, which matches the comment
above.

CID 1596622.
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>
(cherry picked from commit af7654331f)
This commit is contained in:
Douglas Bagnall 2024-04-26 15:24:47 +12:00 committed by Jule Anger
parent 7d295cb6fe
commit 21a01b3bad
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/ldb/common/ldb_dn.c
View File

@ -1141,13 +1141,23 @@ int ldb_dn_compare(struct ldb_dn *dn0, struct ldb_dn *dn1)
* | normal DNs, sorted | casefold failed DNs | invalid DNs | NULLs |
*/
if (dn0 == dn1 || (dn0->invalid && dn1->invalid)) {
if (dn0 == dn1) {
/* this includes the both-NULL case */
return 0;
}
if (dn0 == NULL || dn0->invalid) {
if (dn0 == NULL) {
return 1;
}
if (dn1 == NULL || dn1->invalid) {
if (dn1 == NULL) {
return -1;
}
if (dn0->invalid && dn1->invalid) {
return 0;
}
if (dn0->invalid) {
return 1;
}
if (dn1->invalid) {
return -1;
}