re PR libstdc++/47724 ([C++0x] Regex string anchors cause segfault)
2011-02-17 Jonathan Wakely <jwakely.gcc@gmail.com> PR libstdc++/47724 * include/bits/regex_compiler.h (_Scanner::_M_advance): Do not treat line anchors as metacharacters. * testsuite/28_regex/basic_regex/ctors/47724.cc: New. From-SVN: r170236
This commit is contained in:
parent
bde8d7f701
commit
948ef71060
|
@ -1,3 +1,10 @@
|
||||||
|
2011-02-17 Jonathan Wakely <jwakely.gcc@gmail.com>
|
||||||
|
|
||||||
|
PR libstdc++/47724
|
||||||
|
* include/bits/regex_compiler.h (_Scanner::_M_advance): Do not treat
|
||||||
|
line anchors as metacharacters.
|
||||||
|
* testsuite/28_regex/basic_regex/ctors/47724.cc: New.
|
||||||
|
|
||||||
2011-02-16 Paolo Carlini <paolo.carlini@oracle.com>
|
2011-02-16 Paolo Carlini <paolo.carlini@oracle.com>
|
||||||
|
|
||||||
PR libstdc++/47773
|
PR libstdc++/47773
|
||||||
|
|
|
@ -171,6 +171,9 @@ namespace __regex
|
||||||
_M_scan_in_brace();
|
_M_scan_in_brace();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
#if 0
|
||||||
|
// TODO: re-enable line anchors when _M_assertion is implemented.
|
||||||
|
// See PR libstdc++/47724
|
||||||
else if (_M_state & _S_state_at_start && __c == _M_ctype.widen('^'))
|
else if (_M_state & _S_state_at_start && __c == _M_ctype.widen('^'))
|
||||||
{
|
{
|
||||||
_M_curToken = _S_token_line_begin;
|
_M_curToken = _S_token_line_begin;
|
||||||
|
@ -183,6 +186,7 @@ namespace __regex
|
||||||
++_M_current;
|
++_M_current;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
else if (__c == _M_ctype.widen('.'))
|
else if (__c == _M_ctype.widen('.'))
|
||||||
{
|
{
|
||||||
_M_curToken = _S_token_anychar;
|
_M_curToken = _S_token_anychar;
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
// { dg-options "-std=gnu++0x" }
|
||||||
|
|
||||||
|
// Copyright (C) 2011 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/>.
|
||||||
|
|
||||||
|
// PR libstdc++/47724
|
||||||
|
|
||||||
|
#include <regex>
|
||||||
|
|
||||||
|
void test01()
|
||||||
|
{
|
||||||
|
std::regex s("^$");
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
main()
|
||||||
|
{
|
||||||
|
test01();
|
||||||
|
return 0;
|
||||||
|
};
|
Loading…
Reference in New Issue