From cae4063ceaad71f86684bf46a6d6443a730ec91b Mon Sep 17 00:00:00 2001 From: Tim Shen Date: Fri, 28 Aug 2015 02:35:21 +0000 Subject: [PATCH] re PR libstdc++/67362 (std::regex("((.)", std::regex_constants::basic) throws) PR libstdc++/67362 * include/bits/regex_scanner.tcc (_Scanner<>::_M_scan_normal): Always returns ordinary char token if the char isn't considered a special char. * testsuite/28_regex/regression.cc: New test file for collecting regression testcases from, typically, bugzilla. From-SVN: r227289 --- libstdc++-v3/ChangeLog | 9 ++++ libstdc++-v3/include/bits/regex_scanner.tcc | 6 +++ libstdc++-v3/testsuite/28_regex/regression.cc | 42 +++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 libstdc++-v3/testsuite/28_regex/regression.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9b269f8a747..823939fa8f7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2015-08-28 Tim Shen + + PR libstdc++/67362 + * include/bits/regex_scanner.tcc (_Scanner<>::_M_scan_normal): + Always returns ordinary char token if the char isn't + considered a special char. + * testsuite/28_regex/regression.cc: New test file for collecting + regression testcases from, typically, bugzilla. + 2015-08-27 Jonathan Wakely PR libstdc++/67374 diff --git a/libstdc++-v3/include/bits/regex_scanner.tcc b/libstdc++-v3/include/bits/regex_scanner.tcc index 3bcbd0f0483..15556693931 100644 --- a/libstdc++-v3/include/bits/regex_scanner.tcc +++ b/libstdc++-v3/include/bits/regex_scanner.tcc @@ -99,6 +99,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION auto __c = *_M_current++; const char* __pos; + if (std::strchr(_M_spec_char, _M_ctype.narrow(__c, '\0')) == nullptr) + { + _M_token = _S_token_ord_char; + _M_value.assign(1, __c); + return; + } if (__c == '\\') { if (_M_current == _M_end) diff --git a/libstdc++-v3/testsuite/28_regex/regression.cc b/libstdc++-v3/testsuite/28_regex/regression.cc new file mode 100644 index 00000000000..71d82d50459 --- /dev/null +++ b/libstdc++-v3/testsuite/28_regex/regression.cc @@ -0,0 +1,42 @@ +// { dg-options "-std=gnu++11" } + +// +// Copyright (C) 2015 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include + +using namespace __gnu_test; +using namespace std; + +// PR libstdc++/67362 +void +test01() +{ + bool test __attribute__((unused)) = true; + + regex re("((.)", regex_constants::basic); +} + +int +main() +{ + test01(); + return 0; +} + -- 2.30.2