Fix boundary error

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@4505 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 1999-07-02 10:59:02 +00:00
parent 820482b623
commit 29ed137806
2 changed files with 9 additions and 4 deletions

View file

@ -1,3 +1,8 @@
Fre Jul 2 12:10:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/GSeq.h: Fix boundary error when searching for string in
string.
Fre Jul 2 8:45:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSUnarchiver.m: In designated initialiser, catch exceptions

View file

@ -779,7 +779,7 @@ GSEQ_STRRANGE(NSString *ss, NSString *os, unsigned mask, NSRange aRange)
}
}
myIndex += sRange.length;
if (myIndex >= myEndIndex)
if (myIndex > myEndIndex)
break;
}
}
@ -852,7 +852,7 @@ GSEQ_STRRANGE(NSString *ss, NSString *os, unsigned mask, NSRange aRange)
}
}
}
if (myIndex <= myEndIndex)
if (myIndex < myEndIndex)
break;
myIndex--;
while (uni_isnonsp(GSEQ_SGETC(myIndex))
@ -922,7 +922,7 @@ GSEQ_STRRANGE(NSString *ss, NSString *os, unsigned mask, NSRange aRange)
}
}
}
if (myIndex <= myEndIndex)
if (myIndex < myEndIndex)
break;
myIndex--;
while (uni_isnonsp(GSEQ_SGETC(myIndex))
@ -994,7 +994,7 @@ GSEQ_STRRANGE(NSString *ss, NSString *os, unsigned mask, NSRange aRange)
}
}
myIndex += sRange.length;
if (myIndex >= myEndIndex)
if (myIndex > myEndIndex)
break;
}
}