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

Check for nil in compare and rangeOfString

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@4293 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-05-25 14:27:42 +00:00
parent e27f669f9d
commit 285a89e043
3 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/NSGCString.m
View file

@ -696,8 +696,11 @@ static IMP msInitImp; /* designated initialiser for mutable */
options: (unsigned int)mask options: (unsigned int)mask
range: (NSRange)aRange range: (NSRange)aRange
{ {
Class c = fastClass(aString); Class c;
if (aString == nil)
[NSException raise: NSInvalidArgumentException format: @"compare with nil"];
c = fastClass(aString);
if (c == _fastCls._NSGString || c == _fastCls._NSGMutableString) if (c == _fastCls._NSGString || c == _fastCls._NSGMutableString)
return strCompCsUs(self, aString, mask, aRange); return strCompCsUs(self, aString, mask, aRange);
else if (c == _fastCls._NSGCString || c == _fastCls._NSGMutableCString else if (c == _fastCls._NSGCString || c == _fastCls._NSGMutableCString
@ -711,8 +714,11 @@ static IMP msInitImp; /* designated initialiser for mutable */
options: (unsigned int) mask options: (unsigned int) mask
range: (NSRange) aRange range: (NSRange) aRange
{ {
Class c = fastClass(aString); Class c;
if (aString == nil)
[NSException raise: NSInvalidArgumentException format: @"range of nil"];
c = fastClass(aString);
if (c == _fastCls._NSGString || c == _fastCls._NSGMutableString) if (c == _fastCls._NSGString || c == _fastCls._NSGMutableString)
return strRangeCsUs(self, aString, mask, aRange); return strRangeCsUs(self, aString, mask, aRange);
else if (c == _fastCls._NSGCString || c == _fastCls._NSGMutableCString else if (c == _fastCls._NSGCString || c == _fastCls._NSGMutableCString

10
Source/NSGString.m
View file

@ -430,8 +430,11 @@
options: (unsigned int)mask options: (unsigned int)mask
range: (NSRange)aRange range: (NSRange)aRange
{ {
Class c = fastClass(aString); Class c;
if (aString == nil)
[NSException raise: NSInvalidArgumentException format: @"compare with nil"];
c = fastClass(aString);
if (c == _fastCls._NSGString || c == _fastCls._NSGMutableString) if (c == _fastCls._NSGString || c == _fastCls._NSGMutableString)
return strCompUsUs(self, aString, mask, aRange); return strCompUsUs(self, aString, mask, aRange);
else if (c == _fastCls._NSGCString || c == _fastCls._NSGMutableCString else if (c == _fastCls._NSGCString || c == _fastCls._NSGMutableCString
@ -445,8 +448,11 @@
options: (unsigned int) mask options: (unsigned int) mask
range: (NSRange) aRange range: (NSRange) aRange
{ {
Class c = fastClass(aString); Class c;
if (aString == nil)
[NSException raise: NSInvalidArgumentException format: @"range of nil"];
c = fastClass(aString);
if (c == _fastCls._NSGString || c == _fastCls._NSGMutableString) if (c == _fastCls._NSGString || c == _fastCls._NSGMutableString)
return strRangeUsUs(self, aString, mask, aRange); return strRangeUsUs(self, aString, mask, aRange);
else if (c == _fastCls._NSGCString || c == _fastCls._NSGMutableCString else if (c == _fastCls._NSGCString || c == _fastCls._NSGMutableCString

4
Source/NSString.m
View file

@ -842,6 +842,8 @@ handle_printf_atsign (FILE *stream,
options: (unsigned int) mask options: (unsigned int) mask
range: (NSRange) aRange range: (NSRange) aRange
{ {
if (aString == nil)
[NSException raise: NSInvalidArgumentException format: @"range of nil"];
return strRangeNsNs(self, aString, mask, aRange); return strRangeNsNs(self, aString, mask, aRange);
} }
@ -884,6 +886,8 @@ handle_printf_atsign (FILE *stream,
options: (unsigned int)mask options: (unsigned int)mask
range: (NSRange)aRange range: (NSRange)aRange
{ {
if (aString == nil)
[NSException raise: NSInvalidArgumentException format: @"compare with nil"];
return strCompNsNs(self, aString, mask, aRange); return strCompNsNs(self, aString, mask, aRange);
} }