From 685cdcaf9f8a710f5e03a00f6398d2de971569e8 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 19 Jan 2016 00:50:37 +0000 Subject: [PATCH] Fix PR#26175. Thanks to Josh Petrie for the report and the patch. Reviewed as http://reviews.llvm.org/D16262 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@258107 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/regex | 3 +++ test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp | 1 + 2 files changed, 4 insertions(+) diff --git a/include/regex b/include/regex index b9dac4765..ca455f0ce 100644 --- a/include/regex +++ b/include/regex @@ -4265,6 +4265,9 @@ basic_regex<_CharT, _Traits>::__parse_atom_escape(_ForwardIterator __first, if (__first != __last && *__first == '\\') { _ForwardIterator __t1 = _VSTD::next(__first); + if (__t1 == __last) + __throw_regex_error(); + _ForwardIterator __t2 = __parse_decimal_escape(__t1, __last); if (__t2 != __t1) __first = __t2; diff --git a/test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp b/test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp index 4da4d957a..9459cd74c 100644 --- a/test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp +++ b/test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp @@ -33,6 +33,7 @@ int main() { assert(error_escape_thrown("[\\a]")); assert(error_escape_thrown("\\a")); + assert(error_escape_thrown("\\")); assert(error_escape_thrown("[\\e]")); assert(error_escape_thrown("\\e"));