commit 82af8ec5ce0c89544a7bc90633828a7051d083c0
Author: Jitka Plesnikova <jplesnik@xxxxxxxxxx>
Date: Thu Jul 4 11:25:35 2013 +0200
Add new source and patches
.gitignore | 1 +
perl-5.18.0-Fix-perl5db-test.patch | 12 ++
...atch-pointer-32-bit-wraparound-regression.patch | 109 ++++++++++++++++++++
sources | 2 +-
4 files changed, 123 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 78e5ce4..591796d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ filter-requires.sh
/perl-5.16.1.tar.gz
/perl-5.16.2.tar.gz
/perl-5.16.3.tar.bz2
+/perl-5.18.0.tar.bz2
diff --git a/perl-5.18.0-Fix-perl5db-test.patch b/perl-5.18.0-Fix-perl5db-test.patch
new file mode 100644
index 0000000..d61c4a7
--- /dev/null
+++ b/perl-5.18.0-Fix-perl5db-test.patch
@@ -0,0 +1,12 @@
+diff -up perl-5.18.0-orig/lib/perl5db.pl.orig perl-5.18.0-orig/lib/perl5db.pl
+diff -up perl-5.18.0-orig/lib/perl5db.t.orig perl-5.18.0-orig/lib/perl5db.t
+--- perl-5.18.0-orig/lib/perl5db.t.orig 2013-06-11 16:56:29.291375625 +0200
++++ perl-5.18.0-orig/lib/perl5db.t 2013-06-12 13:51:32.268233583 +0200
+@@ -2286,6 +2286,7 @@ sub _calc_trace_wrapper
+
+ # Test the o AutoTrace command
+ {
++ local $ENV{PERL_RL} = "o=0";
+ my $wrapper = DebugWrap->new(
+ {
+ cmds =>
diff --git a/perl-5.18.0-Fix-regmatch-pointer-32-bit-wraparound-regression.patch b/perl-5.18.0-Fix-regmatch-pointer-32-bit-wraparound-regression.patch
new file mode 100644
index 0000000..262c42a
--- /dev/null
+++ b/perl-5.18.0-Fix-regmatch-pointer-32-bit-wraparound-regression.patch
@@ -0,0 +1,109 @@
+From 4149c7198d9b78d861df289cce40dd865cab57e7 Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony@xxxxxxxxxxxxxxxx>
+Date: Mon, 3 Jun 2013 22:28:37 +1000
+Subject: [PATCH] Fix regmatch pointer 32-bit wraparound regression
+
+Cherry-picked from:
+
+commit 285a3ca139d04d2ee1894c9a9110294ee8bb0309
+Merge: aad0429 dfb8f19
+Author: Tony Cook <tony@xxxxxxxxxxxxxxxx>
+AuthorDate: Mon Jun 3 22:28:37 2013 +1000
+Commit: Tony Cook <tony@xxxxxxxxxxxxxxxx>
+CommitDate: Mon Jun 3 22:28:37 2013 +1000
+
+ [perl #118175] avoid making pointers outside of objects
+
+ In a couple of cases, when strings were allocated above the 2GB line
+ on 32-bit CPUs, this could cause regexps to act strangely - not matching
+ or crashing perl.
+
+ The final patch in the set prevents pointer creation which the C standard
+ describes as undefined behaviour, but is typically safe (as long as the
+ pointer isn't derefed)
+
+This regression was introduced into 5.18.0 by commit
+4063ade8503ac8877a02fc4eae8ebbe242b9110b.
+---
+ regexec.c | 8 ++++----
+ t/re/pat_rt_report.t | 17 ++++++++++++++++-
+ 2 files changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/regexec.c b/regexec.c
+index bc38839..b865b46 100644
+--- a/regexec.c
++++ b/regexec.c
+@@ -6662,7 +6662,7 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p,
+ scan = *startposp;
+ if (max == REG_INFTY)
+ max = I32_MAX;
+- else if (! utf8_target && scan + max < loceol)
++ else if (! utf8_target && loceol - scan > max)
+ loceol = scan + max;
+
+ /* Here, for the case of a non-UTF-8 target we have adjusted <loceol> down
+@@ -6711,7 +6711,7 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p,
+ scan = loceol;
+ break;
+ case CANY: /* Move <scan> forward <max> bytes, unless goes off end */
+- if (utf8_target && scan + max < loceol) {
++ if (utf8_target && loceol - scan > max) {
+
+ /* <loceol> hadn't been adjusted in the UTF-8 case */
+ scan += max;
+@@ -6730,7 +6730,7 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p,
+ * can use UTF8_IS_INVARIANT() even if the pattern isn't UTF-8, as it's
+ * true iff it doesn't matter if the argument is in UTF-8 or not */
+ if (UTF8_IS_INVARIANT(c) || (! utf8_target && ! is_utf8_pat)) {
+- if (utf8_target && scan + max < loceol) {
++ if (utf8_target && loceol - scan > max) {
+ /* We didn't adjust <loceol> because is UTF-8, but ok to do so,
+ * since here, to match at all, 1 char == 1 byte */
+ loceol = scan + max;
+@@ -6910,7 +6910,7 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p,
+ /* FALLTHROUGH */
+
+ case POSIXA:
+- if (utf8_target && scan + max < loceol) {
++ if (utf8_target && loceol - scan > max) {
+
+ /* We didn't adjust <loceol> at the beginning of this routine
+ * because is UTF-8, but it is actually ok to do so, since here, to
+diff --git a/t/re/pat_rt_report.t b/t/re/pat_rt_report.t
+index 2244fdf..9a9b5f5 100644
+--- a/t/re/pat_rt_report.t
++++ b/t/re/pat_rt_report.t
+@@ -22,7 +22,7 @@ BEGIN {
+ }
+
+
+-plan tests => 2530; # Update this when adding/deleting tests.
++plan tests => 2532; # Update this when adding/deleting tests.
+
+ run_tests() unless caller;
+
+@@ -1158,6 +1158,21 @@ EOP
+ '$_ = "abc"; /b/g; $_ = "hello"; print eval q|$\'|,"\n"',
+ "c\n", {}, '$\' first mentioned after match');
+ }
++
++ {
++ # [perl #118175] threaded perl-5.18.0 fails pat_rt_report_thr.t
++ # this tests some related failures
++ #
++ # The tests in the block *only* fail when run on 32-bit systems
++ # with a malloc that allocates above the 2GB line. On the system
++ # in the report above that only happened in a thread.
++ my $s = "\x{1ff}" . "f" x 32;
++ ok($s =~ /\x{1ff}[[:alpha:]]+/gca, "POSIXA pointer wrap");
++
++ # this one segfaulted under the conditions above
++ # of course, CANY is evil, maybe it should crash
++ ok($s =~ /.\C+/, "CANY pointer wrap");
++ }
+ } # End of sub run_tests
+
+ 1;
+--
+1.8.1.4
+
diff --git a/sources b/sources
index a922c62..46b7cde 100644
--- a/sources
+++ b/sources
@@ -2,4 +2,4 @@ aceea3db13a159cd5f7e5f2e3ad9534f perl-5.8.0-libdir64.patch
ad5d07285d6e4914384b43c9abc2bdba filter-requires.sh
93b780a770906408a34b1c511e333a12 perl.stp
735480c6749c2aa86faa8311fe651142 perl-example.stp
-025102de0e4a597cf541e57da80c6aa3 perl-5.16.3.tar.bz2
+a832e928adfd36d162d2a5d3b631265c perl-5.18.0.tar.bz2
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
