In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/8fcd75a0901066653077fee994c723f2d3327555?hp=7cd05e22ffd07c3c595b9feb16b086cdfcb53f7d>
- Log ----------------------------------------------------------------- commit 8fcd75a0901066653077fee994c723f2d3327555 Author: Chris 'BinGOs' Williams <[email protected]> Date: Tue Mar 5 11:57:20 2013 +0000 Bump File::Copy version as the contents have changed M lib/File/Copy.pm commit 1e1ac268ced5e90dc587e1a816a4fa750165995e Author: Chris 'BinGOs' Williams <[email protected]> Date: Tue Mar 5 11:45:09 2013 +0000 Update Encode to CPAN version 2.49 [DELTA] $Revision: 2.49 $ $Date: 2013/03/05 03:12:49 $ ! Encode.xs Addressed: Encoding objects leak memory if decoding fails https://github.com/dankogai/p5-encode/issues/8 M Porting/Maintainers.pl M cpan/Encode/Changes M cpan/Encode/Encode.pm M cpan/Encode/Encode.xs M cpan/Encode/META.json M cpan/Encode/META.yml M cpan/Encode/Makefile.PL M cpan/Encode/encoding.pm M cpan/Encode/t/Mod_EUCJP.pm M cpan/Encode/t/enc_data.t M cpan/Encode/t/enc_eucjp.t M cpan/Encode/t/enc_module.t M cpan/Encode/t/enc_utf8.t M cpan/Encode/t/jperl.t M cpan/Encode/t/piconv.t ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 +- cpan/Encode/Changes | 9 +++++++-- cpan/Encode/Encode.pm | 4 ++-- cpan/Encode/Encode.xs | 10 +++++----- cpan/Encode/META.json | 2 +- cpan/Encode/META.yml | 2 +- cpan/Encode/Makefile.PL | 2 +- cpan/Encode/encoding.pm | 2 +- cpan/Encode/t/Mod_EUCJP.pm | 2 +- cpan/Encode/t/enc_data.t | 2 +- cpan/Encode/t/enc_eucjp.t | 2 +- cpan/Encode/t/enc_module.t | 2 +- cpan/Encode/t/enc_utf8.t | 2 +- cpan/Encode/t/jperl.t | 2 +- cpan/Encode/t/piconv.t | 2 +- lib/File/Copy.pm | 2 +- 16 files changed, 27 insertions(+), 22 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 57ab853..10dbd40 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -636,7 +636,7 @@ use File::Glob qw(:case); 'Encode' => { 'MAINTAINER' => 'dankogai', - 'DISTRIBUTION' => 'DANKOGAI/Encode-2.48.tar.gz', + 'DISTRIBUTION' => 'DANKOGAI/Encode-2.49.tar.gz', 'FILES' => q[cpan/Encode], 'UPSTREAM' => 'cpan', }, diff --git a/cpan/Encode/Changes b/cpan/Encode/Changes index 36d3880..c916db9 100644 --- a/cpan/Encode/Changes +++ b/cpan/Encode/Changes @@ -1,8 +1,13 @@ # Revision history for Perl extension Encode. # -# $Id: Changes,v 2.48 2013/02/18 02:23:56 dankogai Exp dankogai $ +# $Id: Changes,v 2.49 2013/03/05 03:12:49 dankogai Exp dankogai $ # -$Revision: 2.48 $ $Date: 2013/02/18 02:23:56 $ +$Revision: 2.49 $ $Date: 2013/03/05 03:12:49 $ +! Encode.xs + Addressed: Encoding objects leak memory if decoding fails + https://github.com/dankogai/p5-encode/issues/8 + +2.48 2013/02/18 02:23:56 ! encoding.pm t/Mod_EUCJP.pm t/enc_data.t t/enc_eucjp.t t/enc_module.t t/enc_utf8.t t/encoding.t t/jperl.t diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm index fa78d68..fe81119 100644 --- a/cpan/Encode/Encode.pm +++ b/cpan/Encode/Encode.pm @@ -1,10 +1,10 @@ # -# $Id: Encode.pm,v 2.48 2013/02/18 02:23:56 dankogai Exp dankogai $ +# $Id: Encode.pm,v 2.49 2013/03/05 03:13:47 dankogai Exp dankogai $ # package Encode; use strict; use warnings; -our $VERSION = sprintf "%d.%02d", q$Revision: 2.48 $ =~ /(\d+)/g; +our $VERSION = sprintf "%d.%02d", q$Revision: 2.49 $ =~ /(\d+)/g; use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG}; use XSLoader (); XSLoader::load( __PACKAGE__, $VERSION ); diff --git a/cpan/Encode/Encode.xs b/cpan/Encode/Encode.xs index bb48e5a..f99da10 100644 --- a/cpan/Encode/Encode.xs +++ b/cpan/Encode/Encode.xs @@ -1,5 +1,5 @@ /* - $Id: Encode.xs,v 2.20 2010/12/31 22:48:48 dankogai Exp $ + $Id: Encode.xs,v 2.21 2013/03/05 03:12:49 dankogai Exp dankogai $ */ #define PERL_NO_GET_CONTEXT @@ -440,7 +440,6 @@ CODE: if (src == &PL_sv_undef || SvROK(src)) src = sv_2mortal(newSV(0)); s = (U8 *) SvPV(src, slen); e = (U8 *) SvEND(src); - dst = newSV(slen>0?slen:1); /* newSV() abhors 0 -- inaba */ check = SvROK(check_sv) ? ENCODE_PERLQQ|ENCODE_LEAVE_SRC : SvIV(check_sv); /* * PerlIO check -- we assume the object is of PerlIO if renewed @@ -471,6 +470,7 @@ CODE: } } + dst = sv_2mortal(newSV(slen>0?slen:1)); /* newSV() abhors 0 -- inaba */ s = process_utf8(aTHX_ dst, s, e, check_sv, 0, strict_utf8(aTHX_ obj), renewed); /* Clear out translated part of source unless asked not to */ @@ -482,7 +482,7 @@ CODE: SvCUR_set(src, slen); } SvUTF8_on(dst); - ST(0) = sv_2mortal(dst); + ST(0) = dst; XSRETURN(1); } @@ -504,7 +504,7 @@ CODE: if (src == &PL_sv_undef || SvROK(src)) src = sv_2mortal(newSV(0)); s = (U8 *) SvPV(src, slen); e = (U8 *) SvEND(src); - dst = newSV(slen>0?slen:1); /* newSV() abhors 0 -- inaba */ + dst = sv_2mortal(newSV(slen>0?slen:1)); /* newSV() abhors 0 -- inaba */ if (SvUTF8(src)) { /* Already encoded */ if (strict_utf8(aTHX_ obj)) { @@ -543,7 +543,7 @@ CODE: } SvPOK_only(dst); SvUTF8_off(dst); - ST(0) = sv_2mortal(dst); + ST(0) = dst; XSRETURN(1); } diff --git a/cpan/Encode/META.json b/cpan/Encode/META.json index be0c1d2..4895bda 100644 --- a/cpan/Encode/META.json +++ b/cpan/Encode/META.json @@ -35,5 +35,5 @@ } }, "release_status" : "stable", - "version" : "2.48" + "version" : "2.49" } diff --git a/cpan/Encode/META.yml b/cpan/Encode/META.yml index ddbaaec..398a230 100644 --- a/cpan/Encode/META.yml +++ b/cpan/Encode/META.yml @@ -18,4 +18,4 @@ no_index: - t - inc requires: {} -version: 2.48 +version: 2.49 diff --git a/cpan/Encode/Makefile.PL b/cpan/Encode/Makefile.PL index fab6914..126f00e 100644 --- a/cpan/Encode/Makefile.PL +++ b/cpan/Encode/Makefile.PL @@ -1,5 +1,5 @@ # -# $Id: Makefile.PL,v 2.10 2013/02/18 02:23:56 dankogai Exp dankogai $ +# $Id: Makefile.PL,v 2.10 2013/02/18 02:23:56 dankogai Exp $ # use 5.007003; use strict; diff --git a/cpan/Encode/encoding.pm b/cpan/Encode/encoding.pm index 3761698..2783c9f 100644 --- a/cpan/Encode/encoding.pm +++ b/cpan/Encode/encoding.pm @@ -1,4 +1,4 @@ -# $Id: encoding.pm,v 2.11 2013/02/18 02:23:56 dankogai Exp dankogai $ +# $Id: encoding.pm,v 2.11 2013/02/18 02:23:56 dankogai Exp $ package encoding; our $VERSION = '2.6_01'; diff --git a/cpan/Encode/t/Mod_EUCJP.pm b/cpan/Encode/t/Mod_EUCJP.pm index ebc401e..4f381c5 100644 --- a/cpan/Encode/t/Mod_EUCJP.pm +++ b/cpan/Encode/t/Mod_EUCJP.pm @@ -1,4 +1,4 @@ -# $Id: Mod_EUCJP.pm,v 2.1 2013/02/18 02:23:56 dankogai Exp dankogai $ +# $Id: Mod_EUCJP.pm,v 2.1 2013/02/18 02:23:56 dankogai Exp $ # This file is in euc-jp package Mod_EUCJP; no warnings "deprecated"; diff --git a/cpan/Encode/t/enc_data.t b/cpan/Encode/t/enc_data.t index afca4e5..a0caf65 100644 --- a/cpan/Encode/t/enc_data.t +++ b/cpan/Encode/t/enc_data.t @@ -1,4 +1,4 @@ -# $Id: enc_data.t,v 2.2 2013/02/18 02:23:56 dankogai Exp dankogai $ +# $Id: enc_data.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $ BEGIN { require Config; import Config; diff --git a/cpan/Encode/t/enc_eucjp.t b/cpan/Encode/t/enc_eucjp.t index dc35c35..7c78a68 100644 --- a/cpan/Encode/t/enc_eucjp.t +++ b/cpan/Encode/t/enc_eucjp.t @@ -1,4 +1,4 @@ -# $Id: enc_eucjp.t,v 2.2 2013/02/18 02:23:56 dankogai Exp dankogai $ +# $Id: enc_eucjp.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $ # This is the twin of enc_utf8.t . BEGIN { diff --git a/cpan/Encode/t/enc_module.t b/cpan/Encode/t/enc_module.t index 0ff3fd1..05fc6c2 100644 --- a/cpan/Encode/t/enc_module.t +++ b/cpan/Encode/t/enc_module.t @@ -1,4 +1,4 @@ -# $Id: enc_module.t,v 2.2 2013/02/18 02:23:56 dankogai Exp dankogai $ +# $Id: enc_module.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $ # This file is in euc-jp BEGIN { require Config; import Config; diff --git a/cpan/Encode/t/enc_utf8.t b/cpan/Encode/t/enc_utf8.t index de4a4ad..9c6caa3 100644 --- a/cpan/Encode/t/enc_utf8.t +++ b/cpan/Encode/t/enc_utf8.t @@ -1,4 +1,4 @@ -# $Id: enc_utf8.t,v 2.2 2013/02/18 02:23:56 dankogai Exp dankogai $ +# $Id: enc_utf8.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $ # This is the twin of enc_eucjp.t . BEGIN { diff --git a/cpan/Encode/t/jperl.t b/cpan/Encode/t/jperl.t index 915d26c..3abe86b 100644 --- a/cpan/Encode/t/jperl.t +++ b/cpan/Encode/t/jperl.t @@ -1,5 +1,5 @@ # -# $Id: jperl.t,v 2.2 2013/02/18 02:23:56 dankogai Exp dankogai $ +# $Id: jperl.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $ # # This script is written in euc-jp diff --git a/cpan/Encode/t/piconv.t b/cpan/Encode/t/piconv.t index 1dba44a..e0768d5 100644 --- a/cpan/Encode/t/piconv.t +++ b/cpan/Encode/t/piconv.t @@ -1,5 +1,5 @@ # -# $Id: piconv.t,v 0.4 2013/02/18 02:23:56 dankogai Exp dankogai $ +# $Id: piconv.t,v 0.4 2013/02/18 02:23:56 dankogai Exp $ # BEGIN { diff --git a/lib/File/Copy.pm b/lib/File/Copy.pm index 510467c..19a5838 100644 --- a/lib/File/Copy.pm +++ b/lib/File/Copy.pm @@ -22,7 +22,7 @@ sub syscopy; sub cp; sub mv; -$VERSION = '2.25'; +$VERSION = '2.26'; require Exporter; @ISA = qw(Exporter); -- Perl5 Master Repository
