Changeset 20762 for gsdl/trunk/common-src/src/lib/text_t.cpp

Timestamp:

2009-09-30T11:54:21+13:00 (15 years ago)

Author:

mdewsnip

Message:

Fixed memory bugs (causing crashes on some Windows machines) in findword(), identified by Valgrind.

File:

• gsdl/trunk/common-src/src/lib/text_t.cpp (modified) (2 diffs)

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

@@ -386 +386 @@
       text_t::const_iterator char_match = first;
       text_t::const_iterator word_here = word_begin;
-      while (word_here!=word_end)
+      while (word_here != word_end && char_match != last)
     {
       if (*char_match != *word_here)
@@ -415 +415 @@
       text_t::iterator char_match = first;
       text_t::const_iterator word_here = word_begin;
-      while (word_here!=word_end)
+      while (word_here != word_end && char_match != last)
     {
       if (*char_match != *word_here)