gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-02 17:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix for range issue pointed out by Mathias Bauer <mathias_bauer@gmx.net>

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37685 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2014-02-13 15:45:06 +00:00
parent 017bda675b
commit feddbf6a1b
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/NSPredicate.m
View file

@ -961,6 +961,7 @@ GSICUStringMatchesRegex(NSString *string, NSString *regex, NSStringCompareOption
case NSBeginsWithPredicateOperatorType: case NSBeginsWithPredicateOperatorType:
{ {
NSRange range = NSMakeRange(0, [rightResult length]); NSRange range = NSMakeRange(0, [rightResult length]);
return ([leftResult compare: rightResult return ([leftResult compare: rightResult
options: compareOptions options: compareOptions
range: range] == NSOrderedSame ? YES : NO); range: range] == NSOrderedSame ? YES : NO);
@ -968,9 +969,14 @@ GSICUStringMatchesRegex(NSString *string, NSString *regex, NSStringCompareOption
case NSEndsWithPredicateOperatorType: case NSEndsWithPredicateOperatorType:
{ {
NSRange range; NSRange range;
NSUInteger ll = [leftResult length];
NSUInteger rl = [rightResult length];
range = NSMakeRange([leftResult length] - [rightResult length], if (ll < rl)
[rightResult length]); {
return NO;
}
range = NSMakeRange(ll - rl, rl);
return ([leftResult compare: rightResult return ([leftResult compare: rightResult
options: compareOptions options: compareOptions
range: range] == NSOrderedSame ? YES : NO); range: range] == NSOrderedSame ? YES : NO);