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

Fix NSDictionary and NSMutableDictionary implementation.

Browse source 
NSCharacterSet searches in appropriate places for resources.
NSBundle no longer supports GNUSTEP_LIBRARY_PATH variable.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@2519 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
netc 1997-10-16 23:56:27 +00:00
parent 04e12e7ff5
commit a02a4e9e88
19 changed files with 383 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Source/NSData.m
View file

@ -347,8 +347,8 @@ readContentsOfFile(NSString* path, void** buf, unsigned* len)
// NSRange location and length types will remain unsigned (hence
// the lack of a less-than-zero check).
size = [self length];
if (aRange.location >= size ||
aRange.length >= size ||
if (aRange.location > size ||
aRange.length > size ||
NSMaxRange( aRange ) > size)
{
[NSException raise: NSRangeException
@ -369,7 +369,7 @@ readContentsOfFile(NSString* path, void** buf, unsigned* len)
// so that we can be sure that we don't get a range exception raised
// after we have allocated memory.
l = [self length];
if (aRange.location >= l || aRange.length >= l || NSMaxRange(aRange) > l)
if (aRange.location > l || aRange.length > l || NSMaxRange(aRange) > l)
[NSException raise: NSRangeException
format: @"Range: (%u, %u) Size: %d",
aRange.location, aRange.length, l];
@ -880,8 +880,8 @@ readContentsOfFile(NSString* path, void** buf, unsigned* len)
// NSRange location and length types will remain unsigned (hence
// the lack of a less-than-zero check).
size = [self length];
if (aRange.location >= size ||
aRange.length >= size ||
if (aRange.location > size ||
aRange.length > size ||
NSMaxRange( aRange ) > size)
{
// Raise an exception.
@ -902,8 +902,8 @@ readContentsOfFile(NSString* path, void** buf, unsigned* len)
// NSRange location and length types will remain unsigned (hence
// the lack of a less-than-zero check).
size = [self length];
if (aRange.location >= size ||
aRange.length >= size ||
if (aRange.location > size ||
aRange.length > size ||
NSMaxRange( aRange ) > size)
{
// Raise an exception.
@ -1434,22 +1434,10 @@ readContentsOfFile(NSString* path, void** buf, unsigned* len)
[super dealloc];
}
- (id) init
{
return [self initWithBytesNoCopy: 0 length: 0];
}
- (id) initWithBytesNoCopy: (void*)aBuffer
length: (unsigned int)bufferSize
{
self = [super init];
if (self)
{
bytes = aBuffer;
if (bytes)
length = bufferSize;
}
return self;
return [super initWithBytesNoCopy: aBuffer length: bufferSize];
}
@end