diff mbox

[PR,61720] Clear regex BFS match queue after every iteration

Message ID CAG4ZjN=t0djbs5vrsw2bVeqgBzym2H8FxswhkQsL+Q90D0WJDg@mail.gmail.com
State New
Headers show

Commit Message

Tim Shen July 10, 2014, 4:30 a.m. UTC 
On Wed, Jul 9, 2014 at 1:23 AM, Jonathan Wakely <jwakely@redhat.com> wrote:
> I can't actually reproduce the bug with trunk.

It's a BFS executor bug, so we need to #define
_GLIBCXX_REGEX_USE_THOMPSON_NFA (or use regex_search_debug instead)
and use styles other than ECMAScript.

I didn't notice that it's not a good idea to move all testcases in a
file because of multiple cores, sorry.

Here's the sane patch :)

Comments

Paolo Carlini July 10, 2014, 7:57 a.m. UTC | #1 
On 07/10/2014 06:30 AM, Tim Shen wrote:
> Here's the sane patch :) 
Ok, thanks!

Paolo.
Tim Shen July 15, 2014, 4:30 a.m. UTC | #2 
On Thu, Jul 10, 2014 at 12:57 AM, Paolo Carlini
<paolo.carlini@oracle.com> wrote:
> On 07/10/2014 06:30 AM, Tim Shen wrote:
>>
>> Here's the sane patch :)
>
> Ok, thanks!

Tested and committed.

Thanks!
diff mbox

Patch

diff --git a/libstdc++-v3/include/bits/regex_executor.tcc b/libstdc++-v3/include/bits/regex_executor.tcc
index 38b8ff2..3c68668 100644
--- a/libstdc++-v3/include/bits/regex_executor.tcc
+++ b/libstdc++-v3/include/bits/regex_executor.tcc
@@ -137,6 +137,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	}
       if (__match_mode == _Match_mode::_Exact)
 	__ret = _M_has_sol;
+      _M_states._M_match_queue.clear();
       return __ret;
     }
 
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/61720.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/61720.cc
new file mode 100644
index 0000000..15f4fd6
--- /dev/null
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/61720.cc
@@ -0,0 +1,48 @@ 
+// { dg-options "-std=gnu++11" }
+
+//
+// Copyright (C) 2014 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 <regex>
+#include <testsuite_hooks.h>
+#include <testsuite_regex.h>
+
+using namespace __gnu_test;
+using namespace std;
+
+// libstdc++/61720
+void
+test01()
+{
+  bool test __attribute__((unused)) = true;
+
+  string s = R"("test\")";
+  VERIFY(!regex_search_debug(s, regex(R"("([^"]|\\")*[^\\]")")));
+  VERIFY(!regex_match_debug(s, regex(R"("([^"]|\\")*[^\\]")")));
+  VERIFY(!regex_search_debug(s, regex(R"("([^"]|\\")*[^\\]")",
+					 regex_constants::extended)));
+  VERIFY(!regex_match_debug(s, regex(R"("([^"]|\\")*[^\\]")",
+					regex_constants::extended)));
+}
+
+int
+main()
+{
+  test01();
+  return 0;
+}