diff options
author | Howard Hinnant <hhinnant@apple.com> | 2013-07-11 15:32:55 +0000 |
---|---|---|
committer | Howard Hinnant <hhinnant@apple.com> | 2013-07-11 15:32:55 +0000 |
commit | c815a4e2977b33d6fd9f7dc2acf2126b5ecd369f (patch) | |
tree | 7ea90eab36430925819bf9245a1f8ecf8a17cbe8 | |
parent | e97c71b8fddcbf61fdbfb13b520761d05a646a2c (diff) | |
download | bcm5719-llvm-c815a4e2977b33d6fd9f7dc2acf2126b5ecd369f.tar.gz bcm5719-llvm-c815a4e2977b33d6fd9f7dc2acf2126b5ecd369f.zip |
Bill Fisher: This patch fixes a less likely case where '\b' can back up into invalid memory, when driven by a regex_iterator (for case 1, see r185273 or http://llvm.org/bugs/show_bug.cgi?id=16240)
The attached test program also supplies a test for the case 1 fix in r185273.
llvm-svn: 186089
-rw-r--r-- | libcxx/include/regex | 5 | ||||
-rw-r--r-- | libcxx/test/re/re.alg/re.alg.search/backup.pass.cpp | 63 |
2 files changed, 66 insertions, 2 deletions
diff --git a/libcxx/include/regex b/libcxx/include/regex index 36d5677072f..19e08b13aaf 100644 --- a/libcxx/include/regex +++ b/libcxx/include/regex @@ -5811,9 +5811,10 @@ regex_search(_BidirectionalIterator __first, _BidirectionalIterator __last, const basic_regex<_CharT, _Traits>& __e, regex_constants::match_flag_type __flags = regex_constants::match_default) { - basic_string<_CharT> __s(__first, __last); + int __offset = (__flags & regex_constants::match_prev_avail) ? 1 : 0; + basic_string<_CharT> __s(_VSTD::prev(__first, __offset), __last); match_results<const _CharT*> __mc; - bool __r = __e.__search(__s.data(), __s.data() + __s.size(), __mc, __flags); + bool __r = __e.__search(__s.data() + __offset, __s.data() + __s.size(), __mc, __flags); __m.__assign(__first, __last, __mc, __flags & regex_constants::__no_update_pos); return __r; } diff --git a/libcxx/test/re/re.alg/re.alg.search/backup.pass.cpp b/libcxx/test/re/re.alg/re.alg.search/backup.pass.cpp new file mode 100644 index 00000000000..6bfad422b9f --- /dev/null +++ b/libcxx/test/re/re.alg/re.alg.search/backup.pass.cpp @@ -0,0 +1,63 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// <regex> + +// template <class BidirectionalIterator, class Allocator, class charT, class traits> +// bool +// regex_search(BidirectionalIterator first, BidirectionalIterator last, +// match_results<BidirectionalIterator, Allocator>& m, +// const basic_regex<charT, traits>& e, +// regex_constants::match_flag_type flags = regex_constants::match_default); + +#include <regex> +#include <string> +#include <list> +#include <cassert> + +int main() +{ + // This regex_iterator uses regex_search(__wrap_iter<_Iter> __first, ...) + // Test for http://llvm.org/bugs/show_bug.cgi?id=16240 fixed in r185273. + { + std::string s{"aaaa a"}; + std::regex re{"\\ba"}; + std::sregex_iterator it{s.begin(), s.end(), re}; + std::sregex_iterator end{}; + + assert(it->position(0) == 0); + assert(it->length(0) == 1); + + ++it; + assert(it->position(0) == 5); + assert(it->length(0) == 1); + + ++it; + assert(it == end); + } + + // This regex_iterator uses regex_search(_BidirectionalIterator __first, ...) + { + std::string s{"aaaa a"}; + std::list<char> l{s.begin(), s.end()}; + std::regex re{"\\ba"}; + std::regex_iterator<std::list<char>::iterator> it{l.begin(), l.end(), re}; + std::regex_iterator<std::list<char>::iterator> end{}; + + assert(it->position(0) == 0); + assert(it->length(0) == 1); + + ++it; + assert(it->position(0) == 5); + assert(it->length(0) == 1); + + ++it; + assert(it == end); + } +} |