public inbox for gcc-bugs@sourceware.org help / color / mirror / Atom feed
From: "cvs-commit at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org> To: gcc-bugs@gcc.gnu.org Subject: [Bug libstdc++/102447] std::regex incorrectly accepts invalid bracket expression Date: Thu, 07 Jul 2022 23:33:16 +0000 [thread overview] Message-ID: <bug-102447-4-8qq6As4JnP@http.gcc.gnu.org/bugzilla/> (raw) In-Reply-To: <bug-102447-4@http.gcc.gnu.org/bugzilla/> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102447 --- Comment #11 from CVS Commits <cvs-commit at gcc dot gnu.org> --- The releases/gcc-11 branch has been updated by Jonathan Wakely <redi@gcc.gnu.org>: https://gcc.gnu.org/g:c725028a8bb9478ec84332641147ad12b9236922 commit r11-10130-gc725028a8bb9478ec84332641147ad12b9236922 Author: Jonathan Wakely <jwakely@redhat.com> Date: Tue Dec 14 14:32:35 2021 +0000 libstdc++: Fix handling of invalid ranges in std::regex [PR102447] std::regex currently allows invalid bracket ranges such as [\w-a] which are only allowed by ECMAScript when in web browser compatibility mode. It should be an error, because the start of the range is a character class, not a single character. The current implementation of _Compiler::_M_expression_term does not provide a way to reject this, because we only remember a previous character, not whether we just processed a character class (or collating symbol etc.) This patch replaces the pair<bool, CharT> used to emulate optional<CharT> with a custom class closer to pair<tribool,CharT>. That allows us to track three states, so that we can tell when we've just seen a character class. With this additional state the code in _M_expression_term for processing the _S_token_bracket_dash can be improved to correctly reject the [\w-a] case, without regressing for valid cases such as [\w-] and [----]. libstdc++-v3/ChangeLog: PR libstdc++/102447 * include/bits/regex_compiler.h (_Compiler::_BracketState): New class. (_Compiler::_BrackeyMatcher): New alias template. (_Compiler::_M_expression_term): Change pair<bool, CharT> parameter to _BracketState. Process first character for ECMAScript syntax as well as POSIX. * include/bits/regex_compiler.tcc (_Compiler::_M_insert_bracket_matcher): Pass _BracketState. (_Compiler::_M_expression_term): Use _BracketState to store state between calls. Improve handling of dashes in ranges. * testsuite/28_regex/algorithms/regex_match/cstring_bracket_01.cc: Add more tests for ranges containing dashes. Check invalid ranges with character class at the beginning. (cherry picked from commit 7ce3c230edf6e498e125c805a6dd313bf87dc439)
next prev parent reply other threads:[~2022-07-07 23:33 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-22 10:06 [Bug libstdc++/102447] New: " redi at gcc dot gnu.org 2021-09-24 18:50 ` [Bug libstdc++/102447] " mpolacek at gcc dot gnu.org 2021-09-24 19:03 ` redi at gcc dot gnu.org 2021-09-24 21:32 ` redi at gcc dot gnu.org 2021-09-27 11:45 ` redi at gcc dot gnu.org 2021-10-01 10:24 ` redi at gcc dot gnu.org 2021-10-02 1:28 ` rs2740 at gmail dot com 2021-10-02 6:55 ` redi at gcc dot gnu.org 2021-10-02 16:54 ` rs2740 at gmail dot com 2021-10-04 5:09 ` s.ikarashi at fujitsu dot com 2021-12-13 22:27 ` redi at gcc dot gnu.org 2021-12-14 21:47 ` cvs-commit at gcc dot gnu.org 2021-12-14 21:51 ` redi at gcc dot gnu.org 2022-07-07 23:33 ` cvs-commit at gcc dot gnu.org [this message] 2022-07-07 23:37 ` redi at gcc dot gnu.org 2023-06-23 16:12 ` cvs-commit at gcc dot gnu.org 2023-06-23 16:18 ` redi at gcc dot gnu.org
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=bug-102447-4-8qq6As4JnP@http.gcc.gnu.org/bugzilla/ \ --to=gcc-bugzilla@gcc.gnu.org \ --cc=gcc-bugs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).