regex: fix dead loop in parse_repeat()

Signed-off-by: Xu Huijie xuhuijie2@huawei.com
This commit is contained in:
xuhuijie 2021-06-23 10:05:46 +08:00
parent 24c323dc58
commit d87743f78a
2 changed files with 43 additions and 1 deletions

View File

@ -23,7 +23,7 @@
Name: boost Name: boost
Version: 1.75.0 Version: 1.75.0
Release: 3 Release: 4
Summary: The free peer-reviewed portable C++ source libraries Summary: The free peer-reviewed portable C++ source libraries
License: Boost Software license V1.0 License: Boost Software license V1.0
URL: http://www.boost.org URL: http://www.boost.org
@ -46,6 +46,8 @@ Patch3: boost-1.66.0-no-rpath.patch
# https://github.com/boostorg/locale/issues/52 # https://github.com/boostorg/locale/issues/52
Patch4: boost-1.73-locale-empty-vector.patch Patch4: boost-1.73-locale-empty-vector.patch
Patch9000: regex-fix-dead-loop-in-parse_repeat.patch
Requires: %{name}-atomic%{?_isa} = %{version}-%{release} Requires: %{name}-atomic%{?_isa} = %{version}-%{release}
Requires: %{name}-chrono%{?_isa} = %{version}-%{release} Requires: %{name}-chrono%{?_isa} = %{version}-%{release}
Requires: %{name}-container%{?_isa} = %{version}-%{release} Requires: %{name}-container%{?_isa} = %{version}-%{release}
@ -600,6 +602,7 @@ find ./boost -name '*.hpp' -perm /111 | xargs chmod a-x
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch9000 -p1
%build %build
%if %{with python3} %if %{with python3}
@ -1141,6 +1144,12 @@ fi
%{_mandir}/man1/bjam.1* %{_mandir}/man1/bjam.1*
%changelog %changelog
* Wed Jun 23 2021 Xu Huijie <xuhuijie2@huawei.com> - 1.75.0-4
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix dead loop in parse_repeat()
* Fri Feb 5 2021 xinghe <xinghe1@huawei.com> - 1.75.0-3 * Fri Feb 5 2021 xinghe <xinghe1@huawei.com> - 1.75.0-3
- fix the conflict between the devel package file and the other subpackage file - fix the conflict between the devel package file and the other subpackage file

View File

@ -0,0 +1,33 @@
From 91107fe78a290a7d25a042fec09ea89f14f480d9 Mon Sep 17 00:00:00 2001
From: xuhuijie <xuhuijie2@huawei.com>
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 <xuhuijie2@huawei.com>
---
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<charT, traits>::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