backport: re PR libstdc++/67362 (std::regex("((.)", std::regex_constants::basic)...

	Backport from mainline
	2015-08-28  Tim Shen  <timshen@google.com>

	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: r227291

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 289b8d9d49db0ccaad624ef7bac39355ab8acf67..d597cdf77fe4bee7a5174dcfda8337790528ebfc 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,15 @@
+2015-08-28  Tim Shen  <timshen@google.com>
+
+       Backport from mainline
+       2015-08-28  Tim Shen  <timshen@google.com>
+
+       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-05  Tim Shen  <timshen@google.com>
 
        Backported from mainline

diff --git a/libstdc++-v3/include/bits/regex_scanner.tcc b/libstdc++-v3/include/bits/regex_scanner.tcc
index 5332d2eff84f4cf082766d5092bde71bf33a8baa..7ebd2258d21d5a09337d79e090fcef67970d7f65 100644 (file)
--- a/libstdc++-v3/include/bits/regex_scanner.tcc
+++ b/libstdc++-v3/include/bits/regex_scanner.tcc
@@ -97,6 +97,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 (file)
index 0000000..71d82d5
--- /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
+// <http://www.gnu.org/licenses/>.
+
+#include <testsuite_hooks.h>
+#include <testsuite_regex.h>
+
+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;
+}
+