mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 00:41:02 +00:00
Fix for -[NSNumberFormatter stringForObjectValue:] which could crash on short format strings
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24293 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
69e0e20182
commit
f3ba38c1da
1 changed files with 9 additions and 6 deletions
|
@ -630,13 +630,16 @@
|
|||
|
||||
//sort out the padding for the integer part
|
||||
intPartRange = [useFormat rangeOfCharacterFromSet: placeHolders];
|
||||
while (([placeHolders characterIsMember:
|
||||
[useFormat characterAtIndex: NSMaxRange(intPartRange)]]
|
||||
|| [[useFormat substringFromRange:
|
||||
NSMakeRange(NSMaxRange(intPartRange), 1)] isEqual: @","])
|
||||
&& NSMaxRange(intPartRange) < [useFormat length] - 1)
|
||||
if (NSMaxRange(intPartRange) < ([useFormat length] - 1))
|
||||
{
|
||||
intPartRange.length++;
|
||||
while (([placeHolders characterIsMember:
|
||||
[useFormat characterAtIndex: NSMaxRange(intPartRange)]]
|
||||
|| [[useFormat substringFromRange:
|
||||
NSMakeRange(NSMaxRange(intPartRange), 1)] isEqual: @","])
|
||||
&& NSMaxRange(intPartRange) < [useFormat length] - 1)
|
||||
{
|
||||
intPartRange.length++;
|
||||
}
|
||||
}
|
||||
intPad = [[useFormat substringWithRange: intPartRange] mutableCopy];
|
||||
[intPad replaceOccurrencesOfString: @","
|
||||
|
|
Loading…
Reference in a new issue