ObjFW  Diff

Differences From Artifact [327edac8fd]:

To Artifact [9e2eeeec2e]:


64
65
66
67
68
69
70

71
72
73
74
75
76
77
78

	return [array objectAtIndex: index + range.location];
}

- (void)getObjects: (id*)buffer
	   inRange: (of_range_t)range_
{

	if (range_.location + range_.length > range.length)
		@throw [OFOutOfRangeException exceptionWithClass: [self class]];

	range_.location += range.location;

	return [array getObjects: buffer
			 inRange: range_];
}







>
|







64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79

	return [array objectAtIndex: index + range.location];
}

- (void)getObjects: (id*)buffer
	   inRange: (of_range_t)range_
{
	if (range_.length > SIZE_MAX - range_.location ||
	    range_.location + range_.length > range.length)
		@throw [OFOutOfRangeException exceptionWithClass: [self class]];

	range_.location += range.location;

	return [array getObjects: buffer
			 inRange: range_];
}
105
106
107
108
109
110
111

112
113
114
115
116
117
118
119
		return OF_NOT_FOUND;

	return index;
}

- (OFArray*)objectsInRange: (of_range_t)range_
{

	if (range_.location + range_.length > range.length)
		@throw [OFOutOfRangeException exceptionWithClass: [self class]];

	range_.location += range.location;

	return [array objectsInRange: range_];
}
@end







>
|







106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
		return OF_NOT_FOUND;

	return index;
}

- (OFArray*)objectsInRange: (of_range_t)range_
{
	if (range_.length > SIZE_MAX - range_.location ||
	    range_.location + range_.length > range.length)
		@throw [OFOutOfRangeException exceptionWithClass: [self class]];

	range_.location += range.location;

	return [array objectsInRange: range_];
}
@end