From 29ed1378062310f1a3c16fe85a534fb1cf36febe Mon Sep 17 00:00:00 2001 From: Richard Frith-MacDonald Date: Fri, 2 Jul 1999 10:59:02 +0000 Subject: [PATCH] Fix boundary error git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@4505 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/GSeq.h | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46b9ba8a3..30eee5533 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fre Jul 2 12:10:00 1999 Richard Frith-Macdonald + + * Source/GSeq.h: Fix boundary error when searching for string in + string. + Fre Jul 2 8:45:00 1999 Richard Frith-Macdonald * Source/NSUnarchiver.m: In designated initialiser, catch exceptions diff --git a/Source/GSeq.h b/Source/GSeq.h index c027ab58f..e9d75683a 100644 --- a/Source/GSeq.h +++ b/Source/GSeq.h @@ -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; } }