diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2017-10-19 17:39:16 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2017-10-19 17:39:16 +0000 |
| commit | 52f0885d4323b85cfed79416de9595e7cbb3ce53 (patch) | |
| tree | 8c1b6e8d0077e36f31f5b5ce4e60ebbd350d1a10 /libcxx/include/regex | |
| parent | ea35e46b71732e13427679313eb445eb291f73bd (diff) | |
| download | bcm5719-llvm-52f0885d4323b85cfed79416de9595e7cbb3ce53.tar.gz bcm5719-llvm-52f0885d4323b85cfed79416de9595e7cbb3ce53.zip | |
Fix UB - signed integer overflow in regex. Thanks to Tim Shen for the patch. Reviewed as https://reviews.llvm.org/D39066
llvm-svn: 316172
Diffstat (limited to 'libcxx/include/regex')
| -rw-r--r-- | libcxx/include/regex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libcxx/include/regex b/libcxx/include/regex index bd72012040b..80f958e0e19 100644 --- a/libcxx/include/regex +++ b/libcxx/include/regex @@ -4064,6 +4064,8 @@ basic_regex<_CharT, _Traits>::__parse_DUP_COUNT(_ForwardIterator __first, __first != __last && ( __val = __traits_.value(*__first, 10)) != -1; ++__first) { + if (__c >= std::numeric_limits<int>::max() / 10) + __throw_regex_error<regex_constants::error_badbrace>(); __c *= 10; __c += __val; } |
