Various fixes

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@5594 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 1999-12-21 14:39:56 +00:00
parent d70baaceb8
commit 578d371939
5 changed files with 39 additions and 16 deletions

View file

@ -723,7 +723,10 @@ deserializeFromInfo(_NSDeserializerInfo* info)
_NSDeserializerInfo info;
id o;
NSAssert(data != nil, NSInvalidArgumentException);
if (data == nil || [data isKindOfClass: [NSData class]] == NO)
{
return nil;
}
NSAssert(cursor != 0, NSInvalidArgumentException);
initDeserializerInfo(&info, data, cursor, flag);
o = deserializeFromInfo(&info);
@ -738,7 +741,10 @@ deserializeFromInfo(_NSDeserializerInfo* info)
unsigned int cursor = 0;
id o;
NSAssert(data != nil, NSInvalidArgumentException);
if (data == nil || [data isKindOfClass: [NSData class]] == NO)
{
return nil;
}
initDeserializerInfo(&info, data, &cursor, flag);
o = deserializeFromInfo(&info);
endDeserializerInfo(&info);
@ -750,7 +756,10 @@ deserializeFromInfo(_NSDeserializerInfo* info)
length: (unsigned)length
mutableContainers: (BOOL)flag
{
NSAssert(data != nil, NSInvalidArgumentException);
if (data == nil || [data isKindOfClass: [NSData class]] == NO)
{
return nil;
}
NSAssert(cursor != 0, NSInvalidArgumentException);
if (length > [data length] - *cursor)
{