diff options
author | Michael Cummings <mcummings@gentoo.org> | 2005-12-06 17:16:01 +0000 |
---|---|---|
committer | Michael Cummings <mcummings@gentoo.org> | 2005-12-06 17:16:01 +0000 |
commit | 08a569a4150200ef41b8ff5bcc1454a28ecf2115 (patch) | |
tree | 8e06f590335dfd28926d27b0241cd18d0ce65085 /dev-lang/perl/files | |
parent | Bug #105380 - RPATH again. Bug #113770 - Selinux support. (diff) | |
download | gentoo-2-08a569a4150200ef41b8ff5bcc1454a28ecf2115.tar.gz gentoo-2-08a569a4150200ef41b8ff5bcc1454a28ecf2115.tar.bz2 gentoo-2-08a569a4150200ef41b8ff5bcc1454a28ecf2115.zip |
Bug 114113. Changelog has the tests.
(Portage version: 2.0.53)
Diffstat (limited to 'dev-lang/perl/files')
-rw-r--r-- | dev-lang/perl/files/digest-perl-5.8.6-r8 | 1 | ||||
-rw-r--r-- | dev-lang/perl/files/digest-perl-5.8.7-r3 | 1 | ||||
-rw-r--r-- | dev-lang/perl/files/perl-exp_intwrap.patch | 58 |
3 files changed, 53 insertions, 7 deletions
diff --git a/dev-lang/perl/files/digest-perl-5.8.6-r8 b/dev-lang/perl/files/digest-perl-5.8.6-r8 new file mode 100644 index 000000000000..666169141e1e --- /dev/null +++ b/dev-lang/perl/files/digest-perl-5.8.6-r8 @@ -0,0 +1 @@ +MD5 3d030b6ff2a433840edb1a407d18dc0a perl-5.8.6.tar.bz2 9693085 diff --git a/dev-lang/perl/files/digest-perl-5.8.7-r3 b/dev-lang/perl/files/digest-perl-5.8.7-r3 new file mode 100644 index 000000000000..7407844a5a36 --- /dev/null +++ b/dev-lang/perl/files/digest-perl-5.8.7-r3 @@ -0,0 +1 @@ +MD5 9a175d6ccbb5d9b41ffac5073ff9cc3c perl-5.8.7.tar.bz2 9839086 diff --git a/dev-lang/perl/files/perl-exp_intwrap.patch b/dev-lang/perl/files/perl-exp_intwrap.patch index 1a0283e37696..44c4d4ced361 100644 --- a/dev-lang/perl/files/perl-exp_intwrap.patch +++ b/dev-lang/perl/files/perl-exp_intwrap.patch @@ -1,14 +1,58 @@ ---- perl-5.9.2/sv.c 2005-04-01 01:43:09.000000000 -0800 -+++ perl-5.9.2/sv.c.modified 2005-11-10 16:27:17.000000000 -0800 -@@ -9357,7 +9357,10 @@ +--- sv.c.orig 2005-12-05 06:45:46.000000000 -0500 ++++ sv.c 2005-12-06 11:56:42.000000000 -0500 +@@ -8519,7 +8519,10 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const cha if (EXPECT_NUMBER(q, width)) { if (*q == '$') { ++q; - efix = width; -+ if (width > INT_MAX) -+ efix=INT_MAX; -+ else -+ efix = width; ++ if (width > INT_MAX) ++ efix=INT_MAX; ++ else ++ efix = width; } else { goto gotwidth; } +@@ -8707,9 +8710,10 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const cha + + if (vectorize) + argsv = vecsv; +- else if (!args) +- argsv = (efix ? efix <= svmax : svix < svmax) ? +- svargs[efix ? efix-1 : svix++] : &PL_sv_undef; ++ else if (!args) { ++ I32 i = efix ? efix-1 : svix++; ++ argsv = (i >= 0 && i < svmax) ? svargs[i] : &PL_sv_undef; ++ } + + switch (c = *q++) { + +@@ -8972,6 +8976,8 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const cha + *--eptr = '0'; + break; + case 2: ++ if (!uv) ++ alt = FALSE; + do { + dig = uv & 1; + *--eptr = '0' + dig; +@@ -9274,6 +9280,8 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const cha + + /* calculate width before utf8_upgrade changes it */ + have = esignlen + zeros + elen; ++ if (have < zeros) ++ Perl_croak_nocontext(PL_memory_wrap); + + if (is_utf8 != has_utf8) { + if (is_utf8) { +@@ -9301,6 +9309,11 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const cha + need = (have > width ? have : width); + gap = need - have; + ++#ifdef PERL_MALLOC_WRAP ++ if (need >= (((STRLEN)~0) - SvCUR(sv) - dotstrlen - 1)) { ++ Perl_croak_nocontext(PL_memory_wrap); ++ } ++#endif + SvGROW(sv, SvCUR(sv) + need + dotstrlen + 1); + p = SvEND(sv); + if (esignlen && fill == '0') { |