36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
From 9427806f7298d71bd7edfbdda7506ec63f15dda1 Mon Sep 17 00:00:00 2001
|
|
From: Andrew Bartlett <abartlet@samba.org>
|
|
Date: Mon, 4 Feb 2019 11:22:50 +1300
|
|
Subject: [PATCH] CVE-2019-3824 ldb: Improve code style and layout in wildcard
|
|
processing
|
|
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13773
|
|
|
|
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
|
|
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
|
|
---
|
|
lib/ldb/common/ldb_match.c | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/lib/ldb/common/ldb_match.c b/lib/ldb/common/ldb_match.c
|
|
index 1920b661f75..ab0a89888f0 100644
|
|
--- a/lib/ldb/common/ldb_match.c
|
|
+++ b/lib/ldb/common/ldb_match.c
|
|
@@ -333,9 +333,11 @@ static int ldb_wildcard_compare(struct ldb_context *ldb,
|
|
|
|
g = memmem(haystack,
|
|
haystacklen,
|
|
- (const uint8_t *)cnk.data,
|
|
- cnk.length);
|
|
- if (g) p = g;
|
|
+ (const uint8_t *)cnk.data,
|
|
+ cnk.length);
|
|
+ if (g) {
|
|
+ p = g;
|
|
+ }
|
|
} while(g);
|
|
}
|
|
val.length = val.length - (p - (uint8_t *)(val.data)) - cnk.length;
|
|
--
|
|
2.24.0
|