Changeset 18700

Timestamp:

2009-03-17T14:31:58+13:00 (15 years ago)

Author:

kjdon

Message:

findlastchar was dereferencing the last iterator (end()), so now it decrements that before dereferencing. parameter name changed to last_plus_one to hopefully inform user of this.

Location:

gsdl/trunk/common-src/src/lib

Files:

• text_t.cpp (modified) (2 diffs)
• text_t.h (modified) (1 diff)

gsdl/trunk/common-src/src/lib/text_t.cpp

@@ -358 +358 @@
 }
 
-text_t::iterator findlastchar (text_t::iterator first, text_t::iterator last, 
+text_t::iterator findlastchar (text_t::iterator first, text_t::iterator last_plus_one, 
                unsigned short c)
 {
-  text_t::iterator current = last;
+  text_t::iterator current = last_plus_one - 1;
   while (current != first) {
     if (*current == c) break;
@@ -368 +368 @@
   if (current == first) {
     if (*current == c) return current;
-    return last;
+    return last_plus_one;
   }
 

gsdl/trunk/common-src/src/lib/text_t.h

@@ -225 +225 @@
 text_t::iterator findchar (text_t::iterator first, text_t::iterator last, 
                unsigned short c);
-text_t::iterator findlastchar (text_t::iterator first, text_t::iterator last, 
+// Find the last occurrence of c between first and last_plus_one -1. Returns last_plus_one if not found.
+text_t::iterator findlastchar (text_t::iterator first, text_t::iterator last_plus_one, 
                    unsigned short c);
 text_t::iterator findword (text_t::iterator first, text_t::iterator last,