gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 16:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSString.m (-rangeOfString:options:range:locale:):

Browse source 
Correct result range with ICU codepath


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34880 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
ericwa 2012-03-05 22:31:53 +00:00
parent 391c16f630
commit a9ae729b91
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-03-05 Eric Wasylishen <ewasylishen@gmail.com>
* Source/NSString.m (-rangeOfString:options:range:locale:):
Correct result range with ICU codepath
2012-03-05 Fred Kiefer <FredKiefer@gmx.de> 2012-03-05 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSXMLElement.m (-addAttribute:): Raise correct exception. * Source/NSXMLElement.m (-addAttribute:): Raise correct exception.

6
Source/NSString.m
View file

@ -2162,17 +2162,17 @@ handle_printf_atsign (FILE *stream,
if ((mask & NSBackwardsSearch) == NSBackwardsSearch) if ((mask & NSBackwardsSearch) == NSBackwardsSearch)
{ {
if (matchLocation + matchLength == NSMaxRange(aRange)) if (matchLocation + matchLength == NSMaxRange(aRange))
result = NSMakeRange(matchLocation, matchLength); result = NSMakeRange(aRange.location + matchLocation, matchLength);
} }
else else
{ {
if (matchLocation == 0) if (matchLocation == 0)
result = NSMakeRange(matchLocation, matchLength); result = NSMakeRange(aRange.location + matchLocation, matchLength);
} }
} }
else else
{ {
result = NSMakeRange(matchLocation, matchLength); result = NSMakeRange(aRange.location + matchLocation, matchLength);
} }
} }
} }