sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-05-30 01:05:50 +03:00
Code

r19183: merge from samba4:

Browse Source 
don't crash on invalid utf8 chars

metze
(This used to be commit 71e1f8550f96eaaae7e4fc4d02eb36f1d894abc8)
This commit is contained in:
Stefan Metzmacher 2006-10-09 07:15:27 +00:00 committed by Gerald (Jerry) Carter
parent 617c39ab5f
commit d63a3e05a2
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source3/lib/ldb/common/attrib_handlers.c
View File

@ -184,10 +184,19 @@ static int ldb_comparison_fold(struct ldb_context *ldb, void *mem_ctx,
return (int)(toupper(*s1)) - (int)(toupper(*s2)); return (int)(toupper(*s1)) - (int)(toupper(*s2));
utf8str: utf8str:
/* non need to recheck from the start, just from the first utf8 char found */ /* no need to recheck from the start, just from the first utf8 char found */
b1 = u1 = ldb_casefold(ldb, mem_ctx, s1); b1 = u1 = ldb_casefold(ldb, mem_ctx, s1);
b2 = u2 = ldb_casefold(ldb, mem_ctx, s2); b2 = u2 = ldb_casefold(ldb, mem_ctx, s2);
if (u1 && u2) {
/* Both strings converted correctly */
} else {
/* One of the strings was not UTF8, so we have no options but to do a binary compare */
u1 = s1;
u2 = s2;
}
while (*u1 & *u2) { while (*u1 & *u2) {
if (*u1 != *u2) if (*u1 != *u2)
break; break;
@ -202,9 +211,10 @@ utf8str:
while (*u2 == ' ') u2++; while (*u2 == ' ') u2++;
} }
ret = (int)(*u1 - *u2); ret = (int)(*u1 - *u2);
talloc_free(b1); talloc_free(b1);
talloc_free(b2); talloc_free(b2);
return ret; return ret;
} }