gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added some argument checking.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3075 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 1998-10-17 05:38:46 +00:00
parent d52a07b1b3
commit d841db9f24
1 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Source/NSGDictionary.m
View file

@ -26,6 +26,7 @@
#include <Foundation/NSDictionary.h>
#include <Foundation/NSUtilities.h>
#include <Foundation/NSString.h>
#include <Foundation/NSException.h>
#include <Foundation/NSPortCoder.h>
#include <gnustep/base/Coding.h>
@ -203,6 +204,16 @@ myEqual(NSObject *self, NSObject *other)
for (i = 0; i < c; i++) {
FastMapNode node = FastMapNodeForKey(&map, (FastMapItem)keys[i]);
if (keys[i] == nil) {
[NSException raise: NSInvalidArgumentException
format: @"Tried to init dictionary with nil key"];
}
if (objs[i] == nil) {
[NSException raise: NSInvalidArgumentException
format: @"Tried to init dictionary with nil value"];
}
node = FastMapNodeForKey(&map, (FastMapItem)keys[i]);
if (node) {
[objs[i] retain];
[node->value.o release];
@ -229,10 +240,12 @@ myEqual(NSObject *self, NSObject *other)
- (id) objectForKey: aKey
{
FastMapNode node = FastMapNodeForKey(&map, (FastMapItem)aKey);
if (aKey != nil) {
FastMapNode node = FastMapNodeForKey(&map, (FastMapItem)aKey);
if (node)
return node->value.o;
if (node)
return node->value.o;
}
return nil;
}
@ -257,8 +270,17 @@ myEqual(NSObject *self, NSObject *other)
- (void) setObject: (NSObject*)anObject forKey: (NSObject *)aKey
{
FastMapNode node = FastMapNodeForKey(&map, (FastMapItem)aKey);
FastMapNode node;
if (aKey == nil) {
[NSException raise: NSInvalidArgumentException
format: @"Tried to add nil key to dictionary"];
}
if (anObject == nil) {
[NSException raise: NSInvalidArgumentException
format: @"Tried to add nil value to dictionary"];
}
node = FastMapNodeForKey(&map, (FastMapItem)aKey);
if (node) {
[anObject retain];
[node->value.o release];
@ -276,7 +298,9 @@ myEqual(NSObject *self, NSObject *other)
- (void) removeObjectForKey: (NSObject *)aKey
{
FastMapRemoveKey(&map, (FastMapItem)aKey);
if (aKey) {
FastMapRemoveKey(&map, (FastMapItem)aKey);
}
}
@end