From 7949ab0743d9555cb2c2885d9c8e8fc1e0b64265 Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Thu, 29 Jul 2010 01:15:27 +0000 Subject: fix bug incrementing past end in search llvm-svn: 109716 --- libcxx/include/regex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcxx/include/regex b/libcxx/include/regex index 519c7236d4e..efcc7df7f6b 100644 --- a/libcxx/include/regex +++ b/libcxx/include/regex @@ -1883,7 +1883,7 @@ public: virtual string speak() const { ostringstream os; - if (__invert_) + if (!__invert_) os << "__word_boundary"; else os << "not __word_boundary"; @@ -5404,7 +5404,7 @@ basic_regex<_CharT, _Traits>::__search( __m.__suffix_.matched = __m.__suffix_.first != __m.__suffix_.second; return true; } - if (!(__flags & regex_constants::match_continuous)) + if (__first != __last && !(__flags & regex_constants::match_continuous)) { __m.__matches_.assign(__m.size(), __m.__unmatched_); for (++__first; __first != __last; ++__first) -- cgit v1.2.3