Changeset 1634

Timestamp:

2000-10-31T12:18:00+13:00 (24 years ago)

Author:

paynter

Message:

Fixed error splitting phrase into prefix/body/suffix when suffix is empty.

File:

• trunk/gsdl/src/phind/host/phindcgi.cpp (modified) (3 diffs)

trunk/gsdl/src/phind/host/phindcgi.cpp

@@ -779 +779 @@
       prefix.pop_back();
     }
-    while (*here == ' ') {
+    if ((here != end) && (*here == ' ')) {
       here++;
     }
@@ -800 +800 @@
 // UCArray iterators.
 //
-// Return true if the UCArray is the same as the phrase the iterator points
-// too for the length of the UCArray.
+// Return true if the UCArray is the same as the phrase the iterators point
+// to for the length of the UCArray.
 
 bool phrase_match(UCArray text, UCArray::iterator &here, UCArray::iterator end) {
@@ -812 +812 @@
   // the corresponding element in the second string.
   while (one_here != one_end) {
-    if (*one_here != *two_here) {
-      return false;
-    }
-    one_here++;
-    two_here++;
+   
+      if (two_here == end) {
+      return false;
+      } else if (*one_here != *two_here) {
+      return false;
+      }
+      one_here++;
+      two_here++;
   }