Changes by: szaka
Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv882/libntfs
Modified Files:
unistr.c
Log Message:
Fix ntfs_names_collate() input sanity check intrudoced in cleanups by
reverting to the original one
Index: unistr.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unistr.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- unistr.c 23 Aug 2005 12:17:39 -0000 1.25
+++ unistr.c 24 Sep 2005 15:29:54 -0000 1.26
@@ -115,7 +115,7 @@ int ntfs_names_collate(const ntfschar *n
ntfschar c1, c2;
#ifdef DEBUG
- if (!name1 || !name2 || (ic && (!upcase || !upcase_len))) {
+ if (!name1 || !name2 || (ic && !upcase && upcase_len)) {
Dputs("ntfs_names_collate received NULL pointer!");
exit(1);
}
|
