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

Improve argument checking for range/comparison methods.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@26786 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2008-07-15 08:05:33 +00:00
parent 4c288ca2dd
commit 56b04a2877
2 changed files with 37 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Source/GSString.m
View file

@ -1155,11 +1155,6 @@ compare_c(GSStr self, NSString *aString, unsigned mask, NSRange aRange)
{ {
Class c; Class c;
if (aString == nil)
[NSException raise: NSInvalidArgumentException format: @"compare with nil"];
if (GSObjCIsInstance(aString) == NO)
return strCompCsNs((id)self, aString, mask, aRange);
c = GSObjCClass(aString); c = GSObjCClass(aString);
if (GSObjCIsKindOf(c, GSUnicodeStringClass) == YES if (GSObjCIsKindOf(c, GSUnicodeStringClass) == YES
|| (c == GSMutableStringClass && ((GSStr)aString)->_flags.wide == 1)) || (c == GSMutableStringClass && ((GSStr)aString)->_flags.wide == 1))
@ -1177,11 +1172,6 @@ compare_u(GSStr self, NSString *aString, unsigned mask, NSRange aRange)
{ {
Class c; Class c;
if (aString == nil)
[NSException raise: NSInvalidArgumentException format: @"compare with nil"];
if (GSObjCIsInstance(aString) == NO)
return strCompUsNs((id)self, aString, mask, aRange);
c = GSObjCClass(aString); c = GSObjCClass(aString);
if (GSObjCIsKindOf(c, GSUnicodeStringClass) if (GSObjCIsKindOf(c, GSUnicodeStringClass)
|| (c == GSMutableStringClass && ((GSStr)aString)->_flags.wide == 1)) || (c == GSMutableStringClass && ((GSStr)aString)->_flags.wide == 1))
@ -2830,6 +2820,15 @@ transmute(GSStr self, NSString *aString)
options: (unsigned int)mask options: (unsigned int)mask
range: (NSRange)aRange range: (NSRange)aRange
{ {
GS_RANGE_CHECK(aRange, _count);
if (aString == nil)
[NSException raise: NSInvalidArgumentException
format: @"[%@ -%@] nil string argument",
NSStringFromClass([self class]), NSStringFromSelector(_cmd)];
if (GSObjCIsInstance(aString) == NO)
[NSException raise: NSInvalidArgumentException
format: @"[%@ -%@] not a string argument",
NSStringFromClass([self class]), NSStringFromSelector(_cmd)];
return compare_c((GSStr)self, aString, mask, aRange); return compare_c((GSStr)self, aString, mask, aRange);
} }
@ -3151,6 +3150,15 @@ agree, create a new GSCInlineString otherwise.
options: (unsigned int)mask options: (unsigned int)mask
range: (NSRange)aRange range: (NSRange)aRange
{ {
GS_RANGE_CHECK(aRange, _count);
if (aString == nil)
[NSException raise: NSInvalidArgumentException
format: @"[%@ -%@] nil string argument",
NSStringFromClass([self class]), NSStringFromSelector(_cmd)];
if (GSObjCIsInstance(aString) == NO)
[NSException raise: NSInvalidArgumentException
format: @"[%@ -%@] not a string argument",
NSStringFromClass([self class]), NSStringFromSelector(_cmd)];
return compare_u((GSStr)self, aString, mask, aRange); return compare_u((GSStr)self, aString, mask, aRange);
} }
@ -3543,6 +3551,15 @@ agree, create a new GSUnicodeInlineString otherwise.
options: (unsigned int)mask options: (unsigned int)mask
range: (NSRange)aRange range: (NSRange)aRange
{ {
GS_RANGE_CHECK(aRange, _count);
if (aString == nil)
[NSException raise: NSInvalidArgumentException
format: @"[%@ -%@] nil string argument",
NSStringFromClass([self class]), NSStringFromSelector(_cmd)];
if (GSObjCIsInstance(aString) == NO)
[NSException raise: NSInvalidArgumentException
format: @"[%@ -%@] not a string argument",
NSStringFromClass([self class]), NSStringFromSelector(_cmd)];
if (_flags.wide == 1) if (_flags.wide == 1)
return compare_u((GSStr)self, aString, mask, aRange); return compare_u((GSStr)self, aString, mask, aRange);
else else
@ -4662,6 +4679,15 @@ NSAssert(_flags.free == 1 && _zone != 0, NSInternalInconsistencyException);
options: (unsigned int)mask options: (unsigned int)mask
range: (NSRange)aRange range: (NSRange)aRange
{ {
GS_RANGE_CHECK(aRange, ((GSStr)_parent)->_count);
if (aString == nil)
[NSException raise: NSInvalidArgumentException
format: @"[%@ -%@] nil string argument",
NSStringFromClass([self class]), NSStringFromSelector(_cmd)];
if (GSObjCIsInstance(aString) == NO)
[NSException raise: NSInvalidArgumentException
format: @"[%@ -%@] not a string argument",
NSStringFromClass([self class]), NSStringFromSelector(_cmd)];
if (((GSStr)_parent)->_flags.wide == 1) if (((GSStr)_parent)->_flags.wide == 1)
return compare_u((GSStr)_parent, aString, mask, aRange); return compare_u((GSStr)_parent, aString, mask, aRange);
else else

1
Source/NSString.m
View file

@ -1918,6 +1918,7 @@ handle_printf_atsign (FILE *stream,
options: (unsigned int)mask options: (unsigned int)mask
range: (NSRange)aRange range: (NSRange)aRange
{ {
GS_RANGE_CHECK(aRange, [self length]);
if (aString == nil) if (aString == nil)
[NSException raise: NSInvalidArgumentException format: @"compare with nil"]; [NSException raise: NSInvalidArgumentException format: @"compare with nil"];
return strCompNsNs(self, aString, mask, aRange); return strCompNsNs(self, aString, mask, aRange);