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

Improved range checks

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@4360 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-06-04 16:05:45 +00:00
parent 839c470720
commit a620f606d9
2 changed files with 56 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Source/NSArray.m
View file

@ -352,6 +352,7 @@ static Class NSMutableArray_concrete_class;
- (void) getObjects: (id*)aBuffer - (void) getObjects: (id*)aBuffer
{ {
unsigned i, c = [self count]; unsigned i, c = [self count];
for (i = 0; i < c; i++) for (i = 0; i < c; i++)
aBuffer[i] = [self objectAtIndex: i]; aBuffer[i] = [self objectAtIndex: i];
} }
@ -359,8 +360,12 @@ static Class NSMutableArray_concrete_class;
- (void) getObjects: (id*)aBuffer range: (NSRange)aRange - (void) getObjects: (id*)aBuffer range: (NSRange)aRange
{ {
unsigned i, j = 0, c = [self count], e = aRange.location + aRange.length; unsigned i, j = 0, c = [self count], e = aRange.location + aRange.length;
if (c < e)
e = c; if (aRange.location >= c)
[NSException raise: NSRangeException format:@"Invalid location."];
if (aRange.length > (c - aRange.location))
[NSException raise: NSRangeException format:@"Invalid location+length."];
for (i = aRange.location; i < e; i++) for (i = aRange.location; i < e; i++)
aBuffer[j++] = [self objectAtIndex: i]; aBuffer[j++] = [self objectAtIndex: i];
} }
@ -382,8 +387,12 @@ static Class NSMutableArray_concrete_class;
- (unsigned) indexOfObjectIdenticalTo: anObject inRange: (NSRange)aRange - (unsigned) indexOfObjectIdenticalTo: anObject inRange: (NSRange)aRange
{ {
unsigned i, e = aRange.location + aRange.length, c = [self count]; unsigned i, e = aRange.location + aRange.length, c = [self count];
if (c < e)
e = c; if (aRange.location >= c)
[NSException raise: NSRangeException format:@"Invalid location."];
if (aRange.length > (c - aRange.location))
[NSException raise: NSRangeException format:@"Invalid location+length."];
for (i = aRange.location; i < e; i++) for (i = aRange.location; i < e; i++)
if (anObject == [self objectAtIndex: i]) if (anObject == [self objectAtIndex: i])
return i; return i;
@ -404,8 +413,12 @@ static Class NSMutableArray_concrete_class;
- (unsigned) indexOfObject: anObject inRange: (NSRange)aRange - (unsigned) indexOfObject: anObject inRange: (NSRange)aRange
{ {
unsigned i, e = aRange.location + aRange.length, c = [self count]; unsigned i, e = aRange.location + aRange.length, c = [self count];
if (c < e)
e = c; if (aRange.location >= c)
[NSException raise: NSRangeException format:@"Invalid location."];
if (aRange.length > (c - aRange.location))
[NSException raise: NSRangeException format:@"Invalid location+length."];
for (i = aRange.location; i < e; i++) for (i = aRange.location; i < e; i++)
{ {
id o = [self objectAtIndex: i]; id o = [self objectAtIndex: i];
@ -547,31 +560,24 @@ static Class NSMutableArray_concrete_class;
return nil; return nil;
} }
- (NSArray*) subarrayWithRange: (NSRange)range - (NSArray*) subarrayWithRange: (NSRange)aRange
{ {
id na; id na;
id *objects;
unsigned c = [self count]; unsigned c = [self count];
unsigned i, j, k;
// If array is empty or start is beyond end of array if (aRange.location >= c)
// then return an empty array [NSException raise: NSRangeException format:@"Invalid location."];
if (([self count] == 0) || (range.location > (c-1))) if (aRange.length > (c - aRange.location))
[NSException raise: NSRangeException format:@"Invalid location+length."];
if (aRange.length == 0)
return [NSArray array]; return [NSArray array];
// Obtain bounds
i = range.location;
// Check if length extends beyond end of array
if ((range.location + range.length) > (c-1))
j = c-1;
else
j = range.location + range.length - 1;
{ {
id objects[j-i+1]; id objects[aRange.length];
[self getObjects: objects range: NSMakeRange(i, j-i+1)]; [self getObjects: objects range: aRange];
na = [NSArray arrayWithObjects: objects count: j-i+1]; na = [NSArray arrayWithObjects: objects count: aRange.length];
} }
return na; return na;
} }

9
Source/NSGArray.m
View file

@ -252,10 +252,11 @@
{ {
unsigned i, j = 0, e = aRange.location + aRange.length; unsigned i, j = 0, e = aRange.location + aRange.length;
if (_count < e) if (aRange.location >= _count)
{ [NSException raise: NSRangeException format:@"Invalid location."];
e = _count; if (aRange.length > (_count - aRange.location))
} [NSException raise: NSRangeException format:@"Invalid location+length."];
for (i = aRange.location; i < e; i++) for (i = aRange.location; i < e; i++)
{ {
aBuffer[j++] = _contents_array[i]; aBuffer[j++] = _contents_array[i];