diff --git a/backport-Correct-stack-unwinding-inside-recursions-when-seein.patch b/backport-Correct-stack-unwinding-inside-recursions-when-seein.patch new file mode 100644 index 0000000000000000000000000000000000000000..cd3722b38af04afcac550d4035586377f97598d3 --- /dev/null +++ b/backport-Correct-stack-unwinding-inside-recursions-when-seein.patch @@ -0,0 +1,45 @@ +From 354e02f1413e6a429174e2c1681cc825361c2159 Mon Sep 17 00:00:00 2001 +From: jzmaddock +Date: Wed, 20 Oct 2021 12:12:57 +0100 +Subject: [PATCH] Correct stack unwinding inside recursions when seeing (*SKIP). + +Fixes https://github.com/boostorg/regex/issues/152. + +Signed-off-by: zhangyiru +Signed-off-by: jzmaddock +--- + boost/regex/v4/perl_matcher_non_recursive.hpp | 3 ++- + libs/regex/test/regress/test_perl_ex.cpp | 3 +++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/boost/regex/v4/perl_matcher_non_recursive.hpp b/boost/regex/v4/perl_matcher_non_recursive.hpp +index eb470a78d..e5453e9e7 100644 +--- a/boost/regex/v4/perl_matcher_non_recursive.hpp ++++ b/boost/regex/v4/perl_matcher_non_recursive.hpp +@@ -427,7 +427,8 @@ bool perl_matcher::match_startmark() + { + // Must be unwinding from a COMMIT/SKIP/PRUNE and the independent + // sub failed, need to unwind everything else: +- while(unwind(false)); ++ while (m_backup_state->state_id) ++ unwind(false); + return false; + } + #if !defined(BOOST_NO_EXCEPTIONS) +diff --git a/libs/regex/test/regress/test_perl_ex.cpp b/libs/regex/test/regress/test_perl_ex.cpp +index 6a53256d1..ff74a0742 100644 +--- a/libs/regex/test/regress/test_perl_ex.cpp ++++ b/libs/regex/test/regress/test_perl_ex.cpp +@@ -997,6 +997,9 @@ void test_verbs() + TEST_REGEX_SEARCH("AA+(*SKIP)(B|Z)|AC", perl, "AAAC", match_default, make_array(-2, -2)); + TEST_REGEX_SEARCH("AA+(*SKIP)B|C", perl, "AAAC", match_default, make_array(3, 4, -2, -2)); + ++ // https://github.com/boostorg/regex/issues/152 ++ TEST_REGEX_SEARCH("\\A((\x1f((?1) )?+)?+(*SKIP) *?(?2)*?)\\z", perl, "\x20\x1f\x1f\x20", match_default, make_array(-2, -2)); ++ + TEST_REGEX_SEARCH("^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})", perl, "aaaxxxxxx", match_default, make_array(0, 9, -2, -2)); + TEST_REGEX_SEARCH("^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})", perl, "aaa++++++", match_default, make_array(-2, -2)); + TEST_REGEX_SEARCH("^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})", perl, "bbbxxxxx", match_default, make_array(0, 8, -2, -2)); +-- +2.27.0 + diff --git a/backport-Disallow-repeating-a-case-change-group.patch b/backport-Disallow-repeating-a-case-change-group.patch new file mode 100644 index 0000000000000000000000000000000000000000..c7ec8140925dce2079ee0d7496ac8ab6988bba53 --- /dev/null +++ b/backport-Disallow-repeating-a-case-change-group.patch @@ -0,0 +1,42 @@ +From 370afe3f446c69a7ccc4c09f056272346afc264b Mon Sep 17 00:00:00 2001 +From: zhangyiru +Date: Thu, 14 Oct 2021 15:55:56 -0400 +Subject: [PATCH] Disallow repeating a case-change group + +fix assertion failed: https://github.com/boostorg/regex/issues/151 + +Signed-off-by: zhangyiru +--- + boost/regex/v4/basic_regex_parser.hpp | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/boost/regex/v4/basic_regex_parser.hpp b/boost/regex/v4/basic_regex_parser.hpp +index 6c7065f05..2ce615943 100644 +--- a/boost/regex/v4/basic_regex_parser.hpp ++++ b/boost/regex/v4/basic_regex_parser.hpp +@@ -1042,6 +1042,7 @@ bool basic_regex_parser::parse_repeat(std::size_t low, std::size_ + case syntax_element_jump: + case syntax_element_startmark: + case syntax_element_backstep: ++ case syntax_element_toggle_case: + // can't legally repeat any of the above: + fail(regex_constants::error_badrepeat, m_position - m_base); + return false; +@@ -3116,7 +3117,13 @@ bool basic_regex_parser::unwind_alts(std::ptrdiff_t last_paren_st + m_alt_jumps.pop_back(); + this->m_pdata->m_data.align(); + re_jump* jmp = static_cast(this->getaddress(jump_offset)); +- BOOST_ASSERT(jmp->type == syntax_element_jump); ++ if (jmp->type != syntax_element_jump) ++ { ++ // Something really bad happened, this used to be an assert, ++ // but we'll make it an error just in case we should ever get here. ++ fail(regex_constants::error_unknown, this->m_position - this->m_base, "Internal logic failed while compiling the expression, probably you added a repeat to something non-repeatable!"); ++ return false; ++ } + jmp->alt.i = this->m_pdata->m_data.size() - jump_offset; + } + return true; +-- +2.27.0 + diff --git a/backport-increase_used_block_count_when_use_-put_mem_block.patch b/backport-increase_used_block_count_when_use_-put_mem_block.patch new file mode 100644 index 0000000000000000000000000000000000000000..d13f744d3c4221815b598ee8857e960d04dc8eac --- /dev/null +++ b/backport-increase_used_block_count_when_use_-put_mem_block.patch @@ -0,0 +1,27 @@ +From db3c106f1e80e67f9ed80ee276c5e080519290ad Mon Sep 17 00:00:00 2001 +From: zhangyiru +Date: Thu, 14 Oct 2021 15:39:19 -0400 +Subject: [PATCH] increase used_block_count when use_ put_mem_block + +fix memleak problem: https://github.com/boostorg/regex/issues/153 + +Signed-off-by: zhangyiru +--- + boost/regex/v4/perl_matcher_non_recursive.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/boost/regex/v4/perl_matcher_non_recursive.hpp b/boost/regex/v4/perl_matcher_non_recursive.hpp +index eb470a78d..54ce751da 100644 +--- a/boost/regex/v4/perl_matcher_non_recursive.hpp ++++ b/boost/regex/v4/perl_matcher_non_recursive.hpp +@@ -1363,6 +1363,7 @@ bool perl_matcher::unwind_repeater_counter(bool + template + bool perl_matcher::unwind_extra_block(bool) + { ++ ++used_block_count; + saved_extra_block* pmp = static_cast(m_backup_state); + void* condemmed = m_stack_base; + m_stack_base = pmp->base; +-- +2.27.0 + diff --git a/boost.spec b/boost.spec index 9fc94174b99692574619ef02a90bf3bb1c568bed..2d635e13973315b1ec8f049cc5d67dac5cb794d8 100644 --- a/boost.spec +++ b/boost.spec @@ -22,9 +22,9 @@ Name: boost Version: 1.73.0 -Release: 2 +Release: 6 Summary: The free peer-reviewed portable C++ source libraries -License: Boost Software License V1.0 +License: Boost Software License 1.0 URL: http://www.boost.org Source0: https://sourceforge.net/projects/boost/files/boost/%{version}/%{toplev_dirname}.tar.bz2 Source1: libboost_thread.so @@ -44,6 +44,11 @@ Patch3: boost-1.58.0-pool-test_linking.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1318383 Patch4: boost-1.66.0-no-rpath.patch +Patch9000: regex-fix-dead-loop-in-parse_repeat.patch +Patch9001: backport-Disallow-repeating-a-case-change-group.patch +Patch9002: backport-increase_used_block_count_when_use_-put_mem_block.patch +Patch9003: backport-Correct-stack-unwinding-inside-recursions-when-seein.patch + Requires: %{name}-atomic%{?_isa} = %{version}-%{release} Requires: %{name}-chrono%{?_isa} = %{version}-%{release} Requires: %{name}-container%{?_isa} = %{version}-%{release} @@ -70,6 +75,7 @@ Requires: %{name}-timer%{?_isa} = %{version}-%{release} Requires: %{name}-type_erasure%{?_isa} = %{version}-%{release} Requires: %{name}-wave%{?_isa} = %{version}-%{release} Requires: %{name}-contract%{?_isa} = %{version}-%{release} +Recommends: %{name}-help = %{version}-%{release} BuildRequires: gcc-c++ m4 tcl gdb BuildRequires: libstdc++-devel bzip2-devel zlib-devel libicu-devel @@ -589,6 +595,10 @@ find ./boost -name '*.hpp' -perm /111 | xargs chmod a-x %patch2 -p0 %patch3 -p1 %patch4 -p1 +%patch9000 -p1 +%patch9001 -p1 +%patch9002 -p1 +%patch9003 -p1 %build %if %{with python3} @@ -1135,9 +1145,32 @@ fi %{_mandir}/man1/bjam.1* %changelog -* Wed Dec 16 2020 xinghe - 1.73.0-2 +<<<<<<< openEuler-20.03-LTS-SP1 +* Thu Oct 21 2021 zhangyiru - 1.73.0-6 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: Correct stack unwinding inside recursions when seeing (*SKIP). + +* Thu Oct 14 2021 zhangyiru - 1.73.0-5 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:increase used_block_count when use put_mem_block + Disallow repeating a case-change group + +* Tue Jun 22 2021 Xu Huijie - 1.73.0-4 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix dead loop in parse_repeat() + +* Wed Dec 16 2020 xinghe - 1.73.0-3 - correct license +* Wed Nov 11 2020 xinghe - 1.73.0-2 +- add help for Recommends + * Fri Jul 24 2020 Wang Shuo - 1.73.0-1 - Type:requirement - ID:NA diff --git a/regex-fix-dead-loop-in-parse_repeat.patch b/regex-fix-dead-loop-in-parse_repeat.patch new file mode 100644 index 0000000000000000000000000000000000000000..b0dc52400e6d59b8ad64445ad4f8a43cd67b6789 --- /dev/null +++ b/regex-fix-dead-loop-in-parse_repeat.patch @@ -0,0 +1,33 @@ +From 91107fe78a290a7d25a042fec09ea89f14f480d9 Mon Sep 17 00:00:00 2001 +From: xuhuijie +Date: Wed, 16 Jun 2021 15:47:22 +0800 +Subject: [PATCH] regex: fix dead loop in parse_repea + There is a bug in parse_repeat(), after deal with comment the + contin value will be always true. So we enter a dead loop. To deal with this, + we assign contin to false each time we enter the loop. + Testcase: boost::regex(std::string("1?+(?#)1")) + +Signed-off-by: Xu Huijie +--- + boost/regex/v4/basic_regex_parser.hpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/boost/regex/v4/basic_regex_parser.hpp b/boost/regex/v4/basic_regex_parser.hpp +index 6c7065f05..de22f7000 100644 +--- a/boost/regex/v4/basic_regex_parser.hpp ++++ b/boost/regex/v4/basic_regex_parser.hpp +@@ -1080,9 +1080,10 @@ bool basic_regex_parser::parse_repeat(std::size_t low, std::size_ + // Check for illegal following quantifier, we have to do this here, because + // the extra states we insert below circumvents our usual error checking :-( + // +- bool contin = false; ++ bool contin; + do + { ++ contin = false; + if ((this->flags() & (regbase::main_option_type | regbase::mod_x | regbase::no_perl_ex)) == regbase::mod_x) + { + // whitespace skip: +-- +2.23.0 +