!3 fix error condition of while loop in 0001-bypass-wrong-output-when-enabled-selinux.patch.

Merge pull request !3 from shijieluo/master
This commit is contained in:
openeuler-ci-bot 2020-03-16 10:47:36 +08:00 committed by Gitee
commit 3f03eea585
2 changed files with 9 additions and 2 deletions

View File

@ -35,7 +35,7 @@ index 4b1f8d0..5c017cc 100755
- (!$use_re && $result->[$n] ne $out->[$n]) || - (!$use_re && $result->[$n] ne $out->[$n]) ||
- ( $use_re && $result->[$n] !~ /^$out->[$n]/)) { - ( $use_re && $result->[$n] !~ /^$out->[$n]/)) {
- push @good, ($use_re ? '!~' : '!='); - push @good, ($use_re ? '!~' : '!=');
+ while ($m < $mmax-1 && + while ($m < $mmax &&
+ (!$use_re && $result->[$m] ne $out->[$n]) || + (!$use_re && $result->[$m] ne $out->[$n]) ||
+ ( $use_re && $result->[$m] !~ /^$out->[$n]/)) { + ( $use_re && $result->[$m] !~ /^$out->[$n]/)) {
+ $m++; + $m++;

View File

@ -1,7 +1,7 @@
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
Name: attr Name: attr
Version: 2.4.48 Version: 2.4.48
Release: 6 Release: 7
Summary: Commands for Manipulating Filesystem Extended Attributes Summary: Commands for Manipulating Filesystem Extended Attributes
License: GPLv2+ AND LGPLv2+ License: GPLv2+ AND LGPLv2+
URL: https://savannah.nongnu.org/projects/attr URL: https://savannah.nongnu.org/projects/attr
@ -93,6 +93,13 @@ make %{?_smp_mflags} check
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Mon Mar 16 2020 Shijie Luo<luoshijie1@huawei.com> - 2.4.48-7
- Type:bugfix
- ID:NA
- SUG:restart
- DESC:fix error condition of while loop
in 0001-bypass-wrong-output-when-enabled-selinux.patch.
* Mon Mar 16 2020 Shijie Luo<luoshijie1@huawei.com> - 2.4.48-6 * Mon Mar 16 2020 Shijie Luo<luoshijie1@huawei.com> - 2.4.48-6
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA