Fix an iterator signedness in handling a mro exception

This commit is contained in:
Petr Písař 2020-10-14 15:40:11 +02:00
parent 06591ffb27
commit b9dda65d26
2 changed files with 38 additions and 0 deletions

View File

@ -0,0 +1,31 @@
From fa353c3d2833fc326233e0eb583753b4d7887a63 Mon Sep 17 00:00:00 2001
From: Karl Williamson <khw@cpan.org>
Date: Sun, 4 Oct 2020 11:07:19 -0600
Subject: [PATCH] mro.xs: Fix compiler warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes GH #18155
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
ext/mro/mro.xs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ext/mro/mro.xs b/ext/mro/mro.xs
index f21216af6e..8ce5844904 100644
--- a/ext/mro/mro.xs
+++ b/ext/mro/mro.xs
@@ -253,7 +253,7 @@ S_mro_get_linear_isa_c3(pTHX_ HV* stash, U32 level)
hierarchy is not C3-incompatible */
if(!winner) {
SV *errmsg;
- I32 i;
+ Size_t i;
errmsg = newSVpvf(
"Inconsistent hierarchy during C3 merge of class '%" HEKf "':\n\t"
--
2.25.4

View File

@ -248,6 +248,10 @@ Patch37: perl-5.33.2-gh18096-assume-worst-case-for-GOSUBs-we-don-t-analys
# Fix sv_collxfrm macro to respect locale, in upstream after 5.33.2
Patch38: perl-5.33.2-sv.h-sv_collxfrm-didn-t-work-properly.patch
# Fix an iterator signedness in handling a mro exception, GH#18155,
# in upstream after 5.33.2
Patch39: perl-5.33.2-mro.xs-Fix-compiler-warning.patch
# Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048
Patch200: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch
@ -4286,6 +4290,7 @@ you're not running VMS, this module does nothing.
%patch36 -p1
%patch37 -p1
%patch38 -p1
%patch39 -p1
%patch200 -p1
%patch201 -p1
@ -4331,6 +4336,7 @@ perl -x patchlevel.h \
'Fedora Patch36: Fix a buffer overflow when compiling a regular expression with a bracketed character class with a white space' \
'Fedora Patch37: Fix a mismatch with the recursive subpatterns (GH#18096)' \
'Fedora Patch38: Fix sv_collxfrm macro to respect locale' \
'Fedora Patch39: Fix an iterator signedness in handling a mro exception (GH#18155)' \
'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \
'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \
%{nil}
@ -7046,6 +7052,7 @@ popd
%changelog
* Wed Oct 14 2020 Petr Pisar <ppisar@redhat.com> - 4:5.32.0-465
- Fix sv_collxfrm macro to respect locale
- Fix an iterator signedness in handling a mro exception (GH#18155)
* Fri Sep 25 2020 Petr Pisar <ppisar@redhat.com> - 4:5.32.0-464
- Update perl-IO-Zlib metadata