Author: marshall
Date: Tue Sep 12 10:56:59 2017
New Revision: 313056
URL: http://llvm.org/viewvc/llvm-project?rev=313056&view=rev
Log:
Apply D28224: 'Throw exception after too many steps' Fixes PR#20291. Thanks to
Tim Shen for the patch
Added:
libcxx/trunk/test/std/re/re.alg/re.alg.match/exponential.pass.cpp
libcxx/trunk/test/std/re/re.alg/re.alg.search/exponential.pass.cpp
Modified:
libcxx/trunk/include/regex
Modified: libcxx/trunk/include/regex
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/regex?rev=313056&r1=313055&r2=313056&view=diff
==============================================================================
--- libcxx/trunk/include/regex (original)
+++ libcxx/trunk/include/regex Tue Sep 12 10:56:59 2017
@@ -773,6 +773,8 @@ _LIBCPP_PUSH_MACROS
#include <__undef_macros>
+#define _LIBCPP_REGEX_COMPLEXITY_FACTOR 4096
+
_LIBCPP_BEGIN_NAMESPACE_STD
namespace regex_constants
@@ -5552,8 +5554,14 @@ basic_regex<_CharT, _Traits>::__match_at
__states.back().__node_ = __st;
__states.back().__flags_ = __flags;
__states.back().__at_first_ = __at_first;
+ int __counter = 0;
+ int __length = __last - __first;
do
{
+ ++__counter;
+ if (__counter % _LIBCPP_REGEX_COMPLEXITY_FACTOR == 0 &&
+ __counter / _LIBCPP_REGEX_COMPLEXITY_FACTOR >= __length)
+ __throw_regex_error<regex_constants::error_complexity>();
__state& __s = __states.back();
if (__s.__node_)
__s.__node_->__exec(__s);
@@ -5627,8 +5635,14 @@ basic_regex<_CharT, _Traits>::__match_at
__states.back().__flags_ = __flags;
__states.back().__at_first_ = __at_first;
bool __matched = false;
+ int __counter = 0;
+ int __length = __last - __first;
do
{
+ ++__counter;
+ if (__counter % _LIBCPP_REGEX_COMPLEXITY_FACTOR == 0 &&
+ __counter / _LIBCPP_REGEX_COMPLEXITY_FACTOR >= __length)
+ __throw_regex_error<regex_constants::error_complexity>();
__state& __s = __states.back();
if (__s.__node_)
__s.__node_->__exec(__s);
@@ -5724,8 +5738,14 @@ basic_regex<_CharT, _Traits>::__match_at
__states.back().__at_first_ = __at_first;
const _CharT* __current = __first;
bool __matched = false;
+ int __counter = 0;
+ int __length = __last - __first;
do
{
+ ++__counter;
+ if (__counter % _LIBCPP_REGEX_COMPLEXITY_FACTOR == 0 &&
+ __counter / _LIBCPP_REGEX_COMPLEXITY_FACTOR >= __length)
+ __throw_regex_error<regex_constants::error_complexity>();
__state& __s = __states.back();
if (__s.__node_)
__s.__node_->__exec(__s);
Added: libcxx/trunk/test/std/re/re.alg/re.alg.match/exponential.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/re/re.alg/re.alg.match/exponential.pass.cpp?rev=313056&view=auto
==============================================================================
--- libcxx/trunk/test/std/re/re.alg/re.alg.match/exponential.pass.cpp (added)
+++ libcxx/trunk/test/std/re/re.alg/re.alg.match/exponential.pass.cpp Tue Sep
12 10:56:59 2017
@@ -0,0 +1,46 @@
+//===----------------------------------------------------------------------===//
+//
+// 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_match(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);
+
+// Throw exception after spent too many cycles with respect to the length of
the input string.
+
+#include <regex>
+#include <cassert>
+
+int main() {
+ for (std::regex_constants::syntax_option_type op :
+ {std::regex::ECMAScript, std::regex::extended, std::regex::egrep,
+ std::regex::awk}) {
+ try {
+ std::regex_match(
+ "aaaaaaaaaaaaaaaaaaaa",
+ std::regex(
+ "a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?aaaaaaaaaaaaaaaaaaaa",
+ op));
+ assert(false);
+ } catch (const std::regex_error &e) {
+ assert(e.code() == std::regex_constants::error_complexity);
+ }
+ }
+ std::string s(100000, 'a');
+ for (std::regex_constants::syntax_option_type op :
+ {std::regex::ECMAScript, std::regex::extended, std::regex::egrep,
+ std::regex::awk}) {
+ assert(std::regex_match(s, std::regex("a*", op)));
+ }
+ return 0;
+}
Added: libcxx/trunk/test/std/re/re.alg/re.alg.search/exponential.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/re/re.alg/re.alg.search/exponential.pass.cpp?rev=313056&view=auto
==============================================================================
--- libcxx/trunk/test/std/re/re.alg/re.alg.search/exponential.pass.cpp (added)
+++ libcxx/trunk/test/std/re/re.alg/re.alg.search/exponential.pass.cpp Tue Sep
12 10:56:59 2017
@@ -0,0 +1,46 @@
+//===----------------------------------------------------------------------===//
+//
+// 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);
+
+// Throw exception after spent too many cycles with respect to the length of
the input string.
+
+#include <regex>
+#include <cassert>
+
+int main() {
+ for (std::regex_constants::syntax_option_type op :
+ {std::regex::ECMAScript, std::regex::extended, std::regex::egrep,
+ std::regex::awk}) {
+ try {
+ std::regex_search(
+ "aaaaaaaaaaaaaaaaaaaa",
+ std::regex(
+ "a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?aaaaaaaaaaaaaaaaaaaa",
+ op));
+ assert(false);
+ } catch (const std::regex_error &e) {
+ assert(e.code() == std::regex_constants::error_complexity);
+ }
+ }
+ std::string s(100000, 'a');
+ for (std::regex_constants::syntax_option_type op :
+ {std::regex::ECMAScript, std::regex::extended, std::regex::egrep,
+ std::regex::awk}) {
+ assert(std::regex_search(s, std::regex("a*", op)));
+ }
+ return 0;
+}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
