Compare commits
No commits in common. "c8-stream-5.3" and "c8s" have entirely different histories.
c8-stream-
...
c8s
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/version-0.9924.tar.gz
|
||||
/version-0.9924.tar.gz
|
||||
|
||||
@ -1 +0,0 @@
|
||||
86a2a814def626d269ce332df5d3df1d63b07f5f SOURCES/version-0.9924.tar.gz
|
||||
@ -1,65 +0,0 @@
|
||||
From eecfc44fbd6659ed35719038ecf2b029fe20cfd5 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Mon, 25 Nov 2019 16:48:33 +0100
|
||||
Subject: [PATCH] Subject: [PATCH] ensure locale_name_on_entry isn't clobbered
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
If the return value of setlocale() is static storage, the call to
|
||||
setlocale(LC_NUMERIC, "C"); could overwrite it.
|
||||
|
||||
If the return value of setlocale() is malloced, the call to
|
||||
setlocale(LC_NUMERIC, "C"); could free it.
|
||||
|
||||
Either way, we need to copy it. Fixes gh #17054 rt134212
|
||||
|
||||
Petr Písař: Ported to version-0.9924 from perl commit
|
||||
bcb1da5c29c3a2534a0e43874974b83c9c8b174c.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
vutil/vutil.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/vutil/vutil.c b/vutil/vutil.c
|
||||
index 5d183a0..69c8351 100644
|
||||
--- a/vutil/vutil.c
|
||||
+++ b/vutil/vutil.c
|
||||
@@ -638,6 +638,8 @@ VER_NV:
|
||||
if ( strNE(locale_name_on_entry, "C")
|
||||
&& strNE(locale_name_on_entry, "POSIX"))
|
||||
{
|
||||
+ /* the setlocale() call might free or overwrite the name */
|
||||
+ locale_name_on_entry = savepv(locale_name_on_entry);
|
||||
setlocale(LC_NUMERIC, "C");
|
||||
}
|
||||
else { /* This value indicates to the restore code that we didn't
|
||||
@@ -661,6 +663,8 @@ VER_NV:
|
||||
if ( strNE(locale_name_on_entry, "C")
|
||||
&& strNE(locale_name_on_entry, "POSIX"))
|
||||
{
|
||||
+ /* the setlocale() call might free or overwrite the name */
|
||||
+ locale_name_on_entry = savepv(locale_name_on_entry);
|
||||
setlocale(LC_NUMERIC, "C");
|
||||
}
|
||||
else { /* This value indicates to the restore code that we
|
||||
@@ -710,6 +714,7 @@ VER_NV:
|
||||
|
||||
if (locale_name_on_entry) {
|
||||
setlocale(LC_NUMERIC, locale_name_on_entry);
|
||||
+ Safefree(locale_name_on_entry);
|
||||
}
|
||||
|
||||
LC_NUMERIC_UNLOCK; /* End critical section */
|
||||
@@ -718,6 +723,7 @@ VER_NV:
|
||||
|
||||
if (locale_name_on_entry) {
|
||||
setlocale(LC_NUMERIC, locale_name_on_entry);
|
||||
+ Safefree(locale_name_on_entry);
|
||||
LC_NUMERIC_UNLOCK;
|
||||
}
|
||||
else if (locale_obj_on_entry == PL_underlying_numeric_obj) {
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@ -6,16 +6,14 @@
|
||||
%endif
|
||||
|
||||
Name: perl-version
|
||||
Epoch: 7
|
||||
Epoch: 6
|
||||
Version: 0.99.24
|
||||
%global module_version 0.9924
|
||||
Release: 441%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: Perl extension for Version Objects
|
||||
License: GPL+ or Artistic
|
||||
URL: https://metacpan.org/release/version
|
||||
Source0: https://cpan.metacpan.org/authors/id/J/JP/JPEACOCK/version-%{module_version}.tar.gz
|
||||
# Do not clobber memory when switching a locale, Perl GH#17054, in Perl 5.31.5
|
||||
Patch0: version-0.9924-ensure-locale_name_on_entry-isn-t-clobbered.patch
|
||||
URL: http://search.cpan.org/dist/version/
|
||||
Source0: http://www.cpan.org/authors/id/J/JP/JPEACOCK/version-%{module_version}.tar.gz
|
||||
# Build
|
||||
BuildRequires: findutils
|
||||
BuildRequires: gcc
|
||||
@ -76,7 +74,6 @@ strongly urged to set 0.77 as a minimum in your code.
|
||||
|
||||
%prep
|
||||
%setup -q -n version-%{module_version}
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" UNINST=0 NO_PACKLIST=1
|
||||
@ -104,33 +101,6 @@ make test
|
||||
%{_mandir}/man3/version::Internals.3pm*
|
||||
|
||||
%changelog
|
||||
* Mon Nov 25 2019 Petr Pisar <ppisar@redhat.com> - 7:0.99.24-441
|
||||
- Do not clobber memory when switching a locale (Perl GH#17054)
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7:0.99.24-440
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Jun 02 2019 Jitka Plesnikova <jplesnik@redhat.com> - 7:0.99.24-439
|
||||
- Perl 5.30 re-rebuild of bootstrapped packages
|
||||
|
||||
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 7:0.99.24-438
|
||||
- Increase release to favour standalone package
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7:0.99.24-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7:0.99.24-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Sat Jun 30 2018 Jitka Plesnikova <jplesnik@redhat.com> - 7:0.99.24-4
|
||||
- Perl 5.28 re-rebuild of bootstrapped packages
|
||||
|
||||
* Sat Jun 30 2018 Jitka Plesnikova <jplesnik@redhat.com> - 7:0.99.24-3
|
||||
- Perl 5.28 re-rebuild of bootstrapped packages
|
||||
|
||||
* Tue Jun 26 2018 Jitka Plesnikova <jplesnik@redhat.com> - 7:0.99.24-2
|
||||
- Perl 5.28 rebuild
|
||||
|
||||
* Fri Apr 20 2018 Jitka Plesnikova <jplesnik@redhat.com> - 6:0.99.24-1
|
||||
- 0.9924 bump
|
||||
|
||||
Loading…
Reference in New Issue
Block a user