Compare commits
No commits in common. 'c9' and 'i8c-stream-5.26' have entirely different histories.
c9
...
i8c-stream
@ -1 +1 @@
|
||||
SOURCES/Data-Dumper-2.173.tar.gz
|
||||
SOURCES/Data-Dumper-2.161.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
91ca53fd5499b913996009e763d73ebeb51be8c3 SOURCES/Data-Dumper-2.173.tar.gz
|
||||
a20626bd76d293147dd8ff8afa88deafd2d26899 SOURCES/Data-Dumper-2.161.tar.gz
|
||||
|
||||
@ -0,0 +1,634 @@
|
||||
From 9f38b6c605086a67f0d92591f8e8dc99bc1d9164 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Thu, 11 May 2017 09:25:35 +0200
|
||||
Subject: [PATCH] Upgrade to 2.167
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Unbundled from perl-5.25.12.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
Changes | 14 +++++
|
||||
Dumper.pm | 47 ++++++++---------
|
||||
Dumper.xs | 167 +++++++++++++++++++++++++++++++++++++++++++++---------------
|
||||
t/bugs.t | 37 +++++++++++++-
|
||||
t/deparse.t | 22 ++++----
|
||||
5 files changed, 207 insertions(+), 80 deletions(-)
|
||||
|
||||
diff --git a/Changes b/Changes
|
||||
index f9ea53f..a5430d5 100644
|
||||
--- a/Changes
|
||||
+++ b/Changes
|
||||
@@ -6,6 +6,20 @@ Changes - public release history for Data::Dumper
|
||||
|
||||
=over 8
|
||||
|
||||
+=item 2,166 (Nov 29 2016)
|
||||
+
|
||||
+Reduce memory usage by not importing from Carp
|
||||
+Reduce memory usage by removing unused overload require.
|
||||
+
|
||||
+=item 2.165 (Nov 20 2016)
|
||||
+
|
||||
+Remove impediment to compiling under C++11.
|
||||
+
|
||||
+=item 2.164 (Nov 12 2016)
|
||||
+
|
||||
+The XS implementation now handles the C<Deparse> option, so using it no
|
||||
+longer forces use of the pure-Perl version.
|
||||
+
|
||||
=item 2.161 (Jul 11 2016)
|
||||
|
||||
Perl 5.12 fix/workaround until fixed PPPort release.
|
||||
diff --git a/Dumper.pm b/Dumper.pm
|
||||
index c71ad35..00f6326 100644
|
||||
--- a/Dumper.pm
|
||||
+++ b/Dumper.pm
|
||||
@@ -10,16 +10,15 @@
|
||||
package Data::Dumper;
|
||||
|
||||
BEGIN {
|
||||
- $VERSION = '2.161'; # Don't forget to set version and release
|
||||
+ $VERSION = '2.167'; # Don't forget to set version and release
|
||||
} # date in POD below!
|
||||
|
||||
#$| = 1;
|
||||
|
||||
use 5.006_001;
|
||||
require Exporter;
|
||||
-require overload;
|
||||
|
||||
-use Carp;
|
||||
+use Carp ();
|
||||
|
||||
BEGIN {
|
||||
@ISA = qw(Exporter);
|
||||
@@ -70,7 +69,7 @@ $Maxrecurse = 1000 unless defined $Maxrecurse;
|
||||
sub new {
|
||||
my($c, $v, $n) = @_;
|
||||
|
||||
- croak "Usage: PACKAGE->new(ARRAYREF, [ARRAYREF])"
|
||||
+ Carp::croak("Usage: PACKAGE->new(ARRAYREF, [ARRAYREF])")
|
||||
unless (defined($v) && (ref($v) eq 'ARRAY'));
|
||||
$n = [] unless (defined($n) && (ref($n) eq 'ARRAY'));
|
||||
|
||||
@@ -170,11 +169,11 @@ sub Seen {
|
||||
$s->{seen}{$id} = [$k, $v];
|
||||
}
|
||||
else {
|
||||
- carp "Only refs supported, ignoring non-ref item \$$k";
|
||||
+ Carp::carp("Only refs supported, ignoring non-ref item \$$k");
|
||||
}
|
||||
}
|
||||
else {
|
||||
- carp "Value of ref must be defined; ignoring undefined item \$$k";
|
||||
+ Carp::carp("Value of ref must be defined; ignoring undefined item \$$k");
|
||||
}
|
||||
}
|
||||
return $s;
|
||||
@@ -195,7 +194,7 @@ sub Values {
|
||||
return $s;
|
||||
}
|
||||
else {
|
||||
- croak "Argument to Values, if provided, must be array ref";
|
||||
+ Carp::croak("Argument to Values, if provided, must be array ref");
|
||||
}
|
||||
}
|
||||
else {
|
||||
@@ -214,7 +213,7 @@ sub Names {
|
||||
return $s;
|
||||
}
|
||||
else {
|
||||
- croak "Argument to Names, if provided, must be array ref";
|
||||
+ Carp::croak("Argument to Names, if provided, must be array ref");
|
||||
}
|
||||
}
|
||||
else {
|
||||
@@ -227,7 +226,6 @@ sub DESTROY {}
|
||||
sub Dump {
|
||||
return &Dumpxs
|
||||
unless $Data::Dumper::Useperl || (ref($_[0]) && $_[0]->{useperl})
|
||||
- || $Data::Dumper::Deparse || (ref($_[0]) && $_[0]->{deparse})
|
||||
|
||||
# Use pure perl version on earlier releases on EBCDIC platforms
|
||||
|| (! $IS_ASCII && $] lt 5.021_010);
|
||||
@@ -439,7 +437,7 @@ sub _dump {
|
||||
if (ref($s->{sortkeys}) eq 'CODE') {
|
||||
$keys = $s->{sortkeys}($val);
|
||||
unless (ref($keys) eq 'ARRAY') {
|
||||
- carp "Sortkeys subroutine did not return ARRAYREF";
|
||||
+ Carp::carp("Sortkeys subroutine did not return ARRAYREF");
|
||||
$keys = [];
|
||||
}
|
||||
}
|
||||
@@ -487,16 +485,16 @@ sub _dump {
|
||||
require B::Deparse;
|
||||
my $sub = 'sub ' . (B::Deparse->new)->coderef2text($val);
|
||||
$pad = $s->{sep} . $s->{pad} . $s->{apad} . $s->{xpad} x ($s->{level} - 1);
|
||||
- $sub =~ s/\n/$pad/gse;
|
||||
+ $sub =~ s/\n/$pad/gs;
|
||||
$out .= $sub;
|
||||
}
|
||||
else {
|
||||
$out .= 'sub { "DUMMY" }';
|
||||
- carp "Encountered CODE ref, using dummy placeholder" if $s->{purity};
|
||||
+ Carp::carp("Encountered CODE ref, using dummy placeholder") if $s->{purity};
|
||||
}
|
||||
}
|
||||
else {
|
||||
- croak "Can't handle '$realtype' type";
|
||||
+ Carp::croak("Can't handle '$realtype' type");
|
||||
}
|
||||
|
||||
if ($realpack and !$no_bless) { # we have a blessed ref
|
||||
@@ -1212,9 +1210,10 @@ $Data::Dumper::Deparse I<or> $I<OBJ>->Deparse(I<[NEWVAL]>)
|
||||
|
||||
Can be set to a boolean value to control whether code references are
|
||||
turned into perl source code. If set to a true value, C<B::Deparse>
|
||||
-will be used to get the source of the code reference. Using this option
|
||||
-will force using the Perl implementation of the dumper, since the fast
|
||||
-XSUB implementation doesn't support it.
|
||||
+will be used to get the source of the code reference. In older versions,
|
||||
+using this option imposed a significant performance penalty when dumping
|
||||
+parts of a data structure other than code references, but that is no
|
||||
+longer the case.
|
||||
|
||||
Caution : use this option only if you know that your coderefs will be
|
||||
properly reconstructed by C<B::Deparse>.
|
||||
@@ -1435,15 +1434,9 @@ the C<Deparse> flag), an anonymous subroutine that
|
||||
contains the string '"DUMMY"' will be inserted in its place, and a warning
|
||||
will be printed if C<Purity> is set. You can C<eval> the result, but bear
|
||||
in mind that the anonymous sub that gets created is just a placeholder.
|
||||
-Someday, perl will have a switch to cache-on-demand the string
|
||||
-representation of a compiled piece of code, I hope. If you have prior
|
||||
-knowledge of all the code refs that your data structures are likely
|
||||
-to have, you can use the C<Seen> method to pre-seed the internal reference
|
||||
-table and make the dumped output point to them, instead. See L</EXAMPLES>
|
||||
-above.
|
||||
-
|
||||
-The C<Deparse> flag makes Dump() run slower, since the XSUB
|
||||
-implementation does not support it.
|
||||
+Even using the C<Deparse> flag will in some cases produce results that
|
||||
+behave differently after being passed to C<eval>; see the documentation
|
||||
+for L<B::Deparse>.
|
||||
|
||||
SCALAR objects have the weirdest looking C<bless> workaround.
|
||||
|
||||
@@ -1466,13 +1459,13 @@ be to use the C<Sortkeys> filter of Data::Dumper.
|
||||
|
||||
Gurusamy Sarathy gsar@activestate.com
|
||||
|
||||
-Copyright (c) 1996-2016 Gurusamy Sarathy. All rights reserved.
|
||||
+Copyright (c) 1996-2017 Gurusamy Sarathy. All rights reserved.
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the same terms as Perl itself.
|
||||
|
||||
=head1 VERSION
|
||||
|
||||
-Version 2.161 (July 11 2016)
|
||||
+Version 2.167 (January 4 2017)
|
||||
|
||||
=head1 SEE ALSO
|
||||
|
||||
diff --git a/Dumper.xs b/Dumper.xs
|
||||
index b22088f..0e7142e 100644
|
||||
--- a/Dumper.xs
|
||||
+++ b/Dumper.xs
|
||||
@@ -63,6 +63,7 @@ typedef struct {
|
||||
I32 useqq;
|
||||
int use_sparse_seen_hash;
|
||||
int trailingcomma;
|
||||
+ int deparse;
|
||||
} Style;
|
||||
|
||||
static STRLEN num_q (const char *s, STRLEN slen);
|
||||
@@ -369,7 +370,7 @@ esc_q_utf8(pTHX_ SV* sv, const char *src, STRLEN slen, I32 do_utf8, I32 useqq)
|
||||
UV k;
|
||||
|
||||
if (do_utf8
|
||||
- && ! isASCII(*(U8*)s)
|
||||
+ && ! isASCII(*s)
|
||||
/* Exclude non-ASCII low ordinal controls. This should be
|
||||
* optimized out by the compiler on ASCII platforms; if not
|
||||
* could wrap it in a #ifdef EBCDIC, but better to avoid
|
||||
@@ -387,11 +388,11 @@ esc_q_utf8(pTHX_ SV* sv, const char *src, STRLEN slen, I32 do_utf8, I32 useqq)
|
||||
increment = (k == 0 && *s != '\0') ? 1 : UTF8SKIP(s);
|
||||
|
||||
#if PERL_VERSION < 10
|
||||
- sprintf(r, "\\x{%"UVxf"}", k);
|
||||
+ sprintf(r, "\\x{%" UVxf "}", k);
|
||||
r += strlen(r);
|
||||
/* my_sprintf is not supported by ppport.h */
|
||||
#else
|
||||
- r = r + my_sprintf(r, "\\x{%"UVxf"}", k);
|
||||
+ r = r + my_sprintf(r, "\\x{%" UVxf "}", k);
|
||||
#endif
|
||||
continue;
|
||||
}
|
||||
@@ -505,6 +506,53 @@ sv_x(pTHX_ SV *sv, const char *str, STRLEN len, I32 n)
|
||||
return sv;
|
||||
}
|
||||
|
||||
+static SV *
|
||||
+deparsed_output(pTHX_ SV *val)
|
||||
+{
|
||||
+ SV *text;
|
||||
+ int n;
|
||||
+ dSP;
|
||||
+
|
||||
+ /* This is passed to load_module(), which decrements its ref count and
|
||||
+ * modifies it (so we also can't reuse it below) */
|
||||
+ SV *pkg = newSVpvs("B::Deparse");
|
||||
+
|
||||
+ load_module(PERL_LOADMOD_NOIMPORT, pkg, 0);
|
||||
+
|
||||
+ SAVETMPS;
|
||||
+
|
||||
+ PUSHMARK(SP);
|
||||
+ mXPUSHs(newSVpvs("B::Deparse"));
|
||||
+ PUTBACK;
|
||||
+
|
||||
+ n = call_method("new", G_SCALAR);
|
||||
+ SPAGAIN;
|
||||
+
|
||||
+ if (n != 1) {
|
||||
+ croak("B::Deparse->new returned %d items, but expected exactly 1", n);
|
||||
+ }
|
||||
+
|
||||
+ PUSHMARK(SP - n);
|
||||
+ XPUSHs(val);
|
||||
+ PUTBACK;
|
||||
+
|
||||
+ n = call_method("coderef2text", G_SCALAR);
|
||||
+ SPAGAIN;
|
||||
+
|
||||
+ if (n != 1) {
|
||||
+ croak("$b_deparse->coderef2text returned %d items, but expected exactly 1", n);
|
||||
+ }
|
||||
+
|
||||
+ text = POPs;
|
||||
+ SvREFCNT_inc(text); /* the caller will mortalise this */
|
||||
+
|
||||
+ FREETMPS;
|
||||
+
|
||||
+ PUTBACK;
|
||||
+
|
||||
+ return text;
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* This ought to be split into smaller functions. (it is one long function since
|
||||
* it exactly parallels the perl version, which was one long thing for
|
||||
@@ -565,14 +613,14 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
i = perl_call_method(SvPVX_const(style->freezer), G_EVAL|G_VOID|G_DISCARD);
|
||||
SPAGAIN;
|
||||
if (SvTRUE(ERRSV))
|
||||
- warn("WARNING(Freezer method call failed): %"SVf"", ERRSV);
|
||||
+ warn("WARNING(Freezer method call failed): %" SVf, ERRSV);
|
||||
PUTBACK; FREETMPS; LEAVE;
|
||||
}
|
||||
|
||||
ival = SvRV(val);
|
||||
realtype = SvTYPE(ival);
|
||||
#ifdef DD_USE_OLD_ID_FORMAT
|
||||
- idlen = my_snprintf(id, sizeof(id), "0x%"UVxf, PTR2UV(ival));
|
||||
+ idlen = my_snprintf(id, sizeof(id), "0x%" UVxf, PTR2UV(ival));
|
||||
#else
|
||||
id_buffer = PTR2UV(ival);
|
||||
idlen = sizeof(id_buffer);
|
||||
@@ -630,7 +678,7 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
#ifdef DD_USE_OLD_ID_FORMAT
|
||||
warn("ref name not found for %s", id);
|
||||
#else
|
||||
- warn("ref name not found for 0x%"UVxf, PTR2UV(ival));
|
||||
+ warn("ref name not found for 0x%" UVxf, PTR2UV(ival));
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
@@ -848,10 +896,10 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
ilen = inamelen;
|
||||
sv_setiv(ixsv, ix);
|
||||
#if PERL_VERSION < 10
|
||||
- (void) sprintf(iname+ilen, "%"IVdf, (IV)ix);
|
||||
+ (void) sprintf(iname+ilen, "%" IVdf, (IV)ix);
|
||||
ilen = strlen(iname);
|
||||
#else
|
||||
- ilen = ilen + my_sprintf(iname+ilen, "%"IVdf, (IV)ix);
|
||||
+ ilen = ilen + my_sprintf(iname+ilen, "%" IVdf, (IV)ix);
|
||||
#endif
|
||||
iname[ilen++] = ']'; iname[ilen] = '\0';
|
||||
if (style->indent >= 3) {
|
||||
@@ -886,7 +934,6 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
SV *sname;
|
||||
HE *entry = NULL;
|
||||
char *key;
|
||||
- STRLEN klen;
|
||||
SV *hval;
|
||||
AV *keys = NULL;
|
||||
|
||||
@@ -976,6 +1023,7 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
char *nkey_buffer = NULL;
|
||||
STRLEN nticks = 0;
|
||||
SV* keysv;
|
||||
+ STRLEN klen;
|
||||
STRLEN keylen;
|
||||
STRLEN nlen;
|
||||
bool do_utf8 = FALSE;
|
||||
@@ -1029,7 +1077,7 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
if (style->quotekeys || key_needs_quote(key,keylen)) {
|
||||
if (do_utf8 || style->useqq) {
|
||||
STRLEN ocur = SvCUR(retval);
|
||||
- nlen = esc_q_utf8(aTHX_ retval, key, klen, do_utf8, style->useqq);
|
||||
+ klen = nlen = esc_q_utf8(aTHX_ retval, key, klen, do_utf8, style->useqq);
|
||||
nkey = SvPVX(retval) + ocur;
|
||||
}
|
||||
else {
|
||||
@@ -1095,9 +1143,41 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
SvREFCNT_dec(totpad);
|
||||
}
|
||||
else if (realtype == SVt_PVCV) {
|
||||
- sv_catpvs(retval, "sub { \"DUMMY\" }");
|
||||
- if (style->purity)
|
||||
- warn("Encountered CODE ref, using dummy placeholder");
|
||||
+ if (style->deparse) {
|
||||
+ SV *deparsed = sv_2mortal(deparsed_output(aTHX_ val));
|
||||
+ SV *fullpad = sv_2mortal(newSVsv(style->sep));
|
||||
+ const char *p;
|
||||
+ STRLEN plen;
|
||||
+ I32 i;
|
||||
+
|
||||
+ sv_catsv(fullpad, style->pad);
|
||||
+ sv_catsv(fullpad, apad);
|
||||
+ for (i = 0; i < level; i++) {
|
||||
+ sv_catsv(fullpad, style->xpad);
|
||||
+ }
|
||||
+
|
||||
+ sv_catpvs(retval, "sub ");
|
||||
+ p = SvPV(deparsed, plen);
|
||||
+ while (plen > 0) {
|
||||
+ const char *nl = (const char *) memchr(p, '\n', plen);
|
||||
+ if (!nl) {
|
||||
+ sv_catpvn(retval, p, plen);
|
||||
+ break;
|
||||
+ }
|
||||
+ else {
|
||||
+ size_t n = nl - p;
|
||||
+ sv_catpvn(retval, p, n);
|
||||
+ sv_catsv(retval, fullpad);
|
||||
+ p += n + 1;
|
||||
+ plen -= n + 1;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ else {
|
||||
+ sv_catpvs(retval, "sub { \"DUMMY\" }");
|
||||
+ if (style->purity)
|
||||
+ warn("Encountered CODE ref, using dummy placeholder");
|
||||
+ }
|
||||
}
|
||||
else {
|
||||
warn("cannot handle ref type %d", (int)realtype);
|
||||
@@ -1144,7 +1224,7 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
|
||||
if (namelen) {
|
||||
#ifdef DD_USE_OLD_ID_FORMAT
|
||||
- idlen = my_snprintf(id, sizeof(id), "0x%"UVxf, PTR2UV(val));
|
||||
+ idlen = my_snprintf(id, sizeof(id), "0x%" UVxf, PTR2UV(val));
|
||||
#else
|
||||
id_buffer = PTR2UV(val);
|
||||
idlen = sizeof(id_buffer);
|
||||
@@ -1184,9 +1264,9 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
if (DD_is_integer(val)) {
|
||||
STRLEN len;
|
||||
if (SvIsUV(val))
|
||||
- len = my_snprintf(tmpbuf, sizeof(tmpbuf), "%"UVuf, SvUV(val));
|
||||
+ len = my_snprintf(tmpbuf, sizeof(tmpbuf), "%" UVuf, SvUV(val));
|
||||
else
|
||||
- len = my_snprintf(tmpbuf, sizeof(tmpbuf), "%"IVdf, SvIV(val));
|
||||
+ len = my_snprintf(tmpbuf, sizeof(tmpbuf), "%" IVdf, SvIV(val));
|
||||
if (SvPOK(val)) {
|
||||
/* Need to check to see if this is a string such as " 0".
|
||||
I'm assuming from sprintf isn't going to clash with utf8. */
|
||||
@@ -1412,53 +1492,55 @@ Data_Dumper_Dumpxs(href, ...)
|
||||
&& (hv = (HV*)SvRV((SV*)href))
|
||||
&& SvTYPE(hv) == SVt_PVHV) {
|
||||
|
||||
- if ((svp = hv_fetch(hv, "seen", 4, FALSE)) && SvROK(*svp))
|
||||
+ if ((svp = hv_fetchs(hv, "seen", FALSE)) && SvROK(*svp))
|
||||
seenhv = (HV*)SvRV(*svp);
|
||||
else
|
||||
style.use_sparse_seen_hash = 1;
|
||||
- if ((svp = hv_fetch(hv, "noseen", 6, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "noseen", FALSE)))
|
||||
style.use_sparse_seen_hash = (SvOK(*svp) && SvIV(*svp) != 0);
|
||||
- if ((svp = hv_fetch(hv, "todump", 6, FALSE)) && SvROK(*svp))
|
||||
+ if ((svp = hv_fetchs(hv, "todump", FALSE)) && SvROK(*svp))
|
||||
todumpav = (AV*)SvRV(*svp);
|
||||
- if ((svp = hv_fetch(hv, "names", 5, FALSE)) && SvROK(*svp))
|
||||
+ if ((svp = hv_fetchs(hv, "names", FALSE)) && SvROK(*svp))
|
||||
namesav = (AV*)SvRV(*svp);
|
||||
- if ((svp = hv_fetch(hv, "indent", 6, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "indent", FALSE)))
|
||||
style.indent = SvIV(*svp);
|
||||
- if ((svp = hv_fetch(hv, "purity", 6, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "purity", FALSE)))
|
||||
style.purity = SvIV(*svp);
|
||||
- if ((svp = hv_fetch(hv, "terse", 5, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "terse", FALSE)))
|
||||
terse = SvTRUE(*svp);
|
||||
- if ((svp = hv_fetch(hv, "useqq", 5, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "useqq", FALSE)))
|
||||
style.useqq = SvTRUE(*svp);
|
||||
- if ((svp = hv_fetch(hv, "pad", 3, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "pad", FALSE)))
|
||||
style.pad = *svp;
|
||||
- if ((svp = hv_fetch(hv, "xpad", 4, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "xpad", FALSE)))
|
||||
style.xpad = *svp;
|
||||
- if ((svp = hv_fetch(hv, "apad", 4, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "apad", FALSE)))
|
||||
apad = *svp;
|
||||
- if ((svp = hv_fetch(hv, "sep", 3, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "sep", FALSE)))
|
||||
style.sep = *svp;
|
||||
- if ((svp = hv_fetch(hv, "pair", 4, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "pair", FALSE)))
|
||||
style.pair = *svp;
|
||||
- if ((svp = hv_fetch(hv, "varname", 7, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "varname", FALSE)))
|
||||
varname = *svp;
|
||||
- if ((svp = hv_fetch(hv, "freezer", 7, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "freezer", FALSE)))
|
||||
style.freezer = *svp;
|
||||
- if ((svp = hv_fetch(hv, "toaster", 7, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "toaster", FALSE)))
|
||||
style.toaster = *svp;
|
||||
- if ((svp = hv_fetch(hv, "deepcopy", 8, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "deepcopy", FALSE)))
|
||||
style.deepcopy = SvTRUE(*svp);
|
||||
- if ((svp = hv_fetch(hv, "quotekeys", 9, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "quotekeys", FALSE)))
|
||||
style.quotekeys = SvTRUE(*svp);
|
||||
- if ((svp = hv_fetch(hv, "trailingcomma", 13, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "trailingcomma", FALSE)))
|
||||
style.trailingcomma = SvTRUE(*svp);
|
||||
- if ((svp = hv_fetch(hv, "bless", 5, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "deparse", FALSE)))
|
||||
+ style.deparse = SvTRUE(*svp);
|
||||
+ if ((svp = hv_fetchs(hv, "bless", FALSE)))
|
||||
style.bless = *svp;
|
||||
- if ((svp = hv_fetch(hv, "maxdepth", 8, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "maxdepth", FALSE)))
|
||||
style.maxdepth = SvIV(*svp);
|
||||
- if ((svp = hv_fetch(hv, "maxrecurse", 10, FALSE)))
|
||||
+ if ((svp = hv_fetchs(hv, "maxrecurse", FALSE)))
|
||||
style.maxrecurse = SvIV(*svp);
|
||||
- if ((svp = hv_fetch(hv, "sortkeys", 8, FALSE))) {
|
||||
+ if ((svp = hv_fetchs(hv, "sortkeys", FALSE))) {
|
||||
SV *sv = *svp;
|
||||
if (! SvTRUE(sv))
|
||||
style.sortkeys = NULL;
|
||||
@@ -1525,9 +1607,10 @@ Data_Dumper_Dumpxs(href, ...)
|
||||
}
|
||||
else {
|
||||
STRLEN nchars;
|
||||
- sv_setpvn(name, "$", 1);
|
||||
+ sv_setpvs(name, "$");
|
||||
sv_catsv(name, varname);
|
||||
- nchars = my_snprintf(tmpbuf, sizeof(tmpbuf), "%"IVdf, (IV)(i+1));
|
||||
+ nchars = my_snprintf(tmpbuf, sizeof(tmpbuf), "%" IVdf,
|
||||
+ (IV)(i+1));
|
||||
sv_catpvn(name, tmpbuf, nchars);
|
||||
}
|
||||
|
||||
@@ -1575,7 +1658,7 @@ Data_Dumper_Dumpxs(href, ...)
|
||||
sv_catpvs(retval, ";");
|
||||
sv_catsv(retval, style.sep);
|
||||
}
|
||||
- sv_setpvn(valstr, "", 0);
|
||||
+ SvPVCLEAR(valstr);
|
||||
if (gimme == G_ARRAY) {
|
||||
XPUSHs(sv_2mortal(retval));
|
||||
if (i < imax) /* not the last time thro ? */
|
||||
diff --git a/t/bugs.t b/t/bugs.t
|
||||
index a440b0a..5db82da 100644
|
||||
--- a/t/bugs.t
|
||||
+++ b/t/bugs.t
|
||||
@@ -12,7 +12,7 @@ BEGIN {
|
||||
}
|
||||
|
||||
use strict;
|
||||
-use Test::More tests => 15;
|
||||
+use Test::More tests => 24;
|
||||
use Data::Dumper;
|
||||
|
||||
{
|
||||
@@ -144,4 +144,39 @@ SKIP: {
|
||||
&$tests;
|
||||
}
|
||||
|
||||
+{ # https://rt.perl.org/Ticket/Display.html?id=128524
|
||||
+ my $want;
|
||||
+ my $runtime = "runtime";
|
||||
+ my $requires = "requires";
|
||||
+ utf8::upgrade(my $uruntime = $runtime);
|
||||
+ utf8::upgrade(my $urequires = $requires);
|
||||
+ for my $run ($runtime, $uruntime) {
|
||||
+ for my $req ($requires, $urequires) {
|
||||
+ my $data = { $run => { $req => { foo => "bar" } } };
|
||||
+ local $Data::Dumper::Useperl = 1;
|
||||
+ # we want them all the same
|
||||
+ defined $want or $want = Dumper($data);
|
||||
+ is(Dumper( $data ), $want, "utf-8 indents");
|
||||
+ SKIP:
|
||||
+ {
|
||||
+ defined &Data::Dumper::Dumpxs
|
||||
+ or skip "No XS available", 1;
|
||||
+ local $Data::Dumper::Useperl = 0;
|
||||
+ is(Dumper( $data ), $want, "utf8-indents");
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+# RT#130487 - stack management bug in XS deparse
|
||||
+SKIP: {
|
||||
+ skip "No XS available", 1 if !defined &Data::Dumper::Dumpxs;
|
||||
+ sub rt130487_args { 0 + @_ }
|
||||
+ my $code = sub {};
|
||||
+ local $Data::Dumper::Useperl = 0;
|
||||
+ local $Data::Dumper::Deparse = 1;
|
||||
+ my $got = rt130487_args( Dumper($code) );
|
||||
+ is($got, 1, "stack management in XS deparse works, rt 130487");
|
||||
+}
|
||||
+
|
||||
# EOF
|
||||
diff --git a/t/deparse.t b/t/deparse.t
|
||||
index c281fce..cddde8c 100644
|
||||
--- a/t/deparse.t
|
||||
+++ b/t/deparse.t
|
||||
@@ -15,7 +15,7 @@ BEGIN {
|
||||
use strict;
|
||||
|
||||
use Data::Dumper;
|
||||
-use Test::More tests => 8;
|
||||
+use Test::More tests => 16;
|
||||
use lib qw( ./t/lib );
|
||||
use Testing qw( _dumptostr );
|
||||
|
||||
@@ -24,7 +24,9 @@ use Testing qw( _dumptostr );
|
||||
|
||||
note("\$Data::Dumper::Deparse and Deparse()");
|
||||
|
||||
-{
|
||||
+for my $useperl (0, 1) {
|
||||
+ local $Data::Dumper::Useperl = $useperl;
|
||||
+
|
||||
my ($obj, %dumps, $deparse, $starting);
|
||||
use strict;
|
||||
my $struct = { foo => "bar\nbaz", quux => sub { "fleem" } };
|
||||
@@ -46,11 +48,11 @@ note("\$Data::Dumper::Deparse and Deparse()");
|
||||
$dumps{'objzero'} = _dumptostr($obj);
|
||||
|
||||
is($dumps{'noprev'}, $dumps{'dddzero'},
|
||||
- "No previous setting and \$Data::Dumper::Deparse = 0 are equivalent");
|
||||
+ "No previous setting and \$Data::Dumper::Deparse = 0 are equivalent (useperl=$useperl)");
|
||||
is($dumps{'noprev'}, $dumps{'objempty'},
|
||||
- "No previous setting and Deparse() are equivalent");
|
||||
+ "No previous setting and Deparse() are equivalent (useperl=$useperl)");
|
||||
is($dumps{'noprev'}, $dumps{'objzero'},
|
||||
- "No previous setting and Deparse(0) are equivalent");
|
||||
+ "No previous setting and Deparse(0) are equivalent (useperl=$useperl)");
|
||||
|
||||
local $Data::Dumper::Deparse = 1;
|
||||
$obj = Data::Dumper->new( [ $struct ] );
|
||||
@@ -62,19 +64,19 @@ note("\$Data::Dumper::Deparse and Deparse()");
|
||||
$dumps{'objone'} = _dumptostr($obj);
|
||||
|
||||
is($dumps{'dddtrue'}, $dumps{'objone'},
|
||||
- "\$Data::Dumper::Deparse = 1 and Deparse(1) are equivalent");
|
||||
+ "\$Data::Dumper::Deparse = 1 and Deparse(1) are equivalent (useperl=$useperl)");
|
||||
|
||||
isnt($dumps{'dddzero'}, $dumps{'dddtrue'},
|
||||
- "\$Data::Dumper::Deparse = 0 differs from \$Data::Dumper::Deparse = 1");
|
||||
+ "\$Data::Dumper::Deparse = 0 differs from \$Data::Dumper::Deparse = 1 (useperl=$useperl)");
|
||||
|
||||
like($dumps{'dddzero'},
|
||||
qr/quux.*?sub.*?DUMMY/s,
|
||||
- "\$Data::Dumper::Deparse = 0 reports DUMMY instead of deparsing coderef");
|
||||
+ "\$Data::Dumper::Deparse = 0 reports DUMMY instead of deparsing coderef (useperl=$useperl)");
|
||||
unlike($dumps{'dddtrue'},
|
||||
qr/quux.*?sub.*?DUMMY/s,
|
||||
- "\$Data::Dumper::Deparse = 1 does not report DUMMY");
|
||||
+ "\$Data::Dumper::Deparse = 1 does not report DUMMY (useperl=$useperl)");
|
||||
like($dumps{'dddtrue'},
|
||||
qr/quux.*?sub.*?use\sstrict.*?fleem/s,
|
||||
- "\$Data::Dumper::Deparse = 1 deparses coderef");
|
||||
+ "\$Data::Dumper::Deparse = 1 deparses coderef (useperl=$useperl)");
|
||||
}
|
||||
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
From c38b7faa8bb565553bf125da7244f013822735ff Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Thu, 11 May 2017 13:44:14 +0200
|
||||
Subject: [PATCH] Provide SvPVCLEAR() macro
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
To build with perl <= 5.25.5.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
Dumper.xs | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/Dumper.xs b/Dumper.xs
|
||||
index 0e7142e..5a21721 100644
|
||||
--- a/Dumper.xs
|
||||
+++ b/Dumper.xs
|
||||
@@ -8,6 +8,11 @@
|
||||
# include "ppport.h"
|
||||
#endif
|
||||
|
||||
+/* SvPVCLEAR was added after 5.25.5 and ppport.h does not provide it */
|
||||
+#if !defined SvPVCLEAR
|
||||
+#define SvPVCLEAR(x) sv_setpvs((x), "")
|
||||
+#endif
|
||||
+
|
||||
#if PERL_VERSION < 8
|
||||
# define DD_USE_OLD_ID_FORMAT
|
||||
#endif
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@ -0,0 +1,112 @@
|
||||
From 76b7c82c2947d64a3494175ef6530b3fba8a499d Mon Sep 17 00:00:00 2001
|
||||
From: Zefram <zefram@fysh.org>
|
||||
Date: Wed, 10 Jan 2018 21:09:45 +0000
|
||||
Subject: [PATCH] fix Data-Dumper postentry for quoted glob
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
In Data-Dumper, where a glob with a quoted name required a postentry,
|
||||
the name part of the postentry was being emitted as just "}". This was
|
||||
an old bug affecting upgraded glob names, which the recent commit
|
||||
abda9fe0fe75ae824723761c1c98af958f17a41c made affect all quoted glob
|
||||
names. Fix the postentry name to encompass the entire quoted name.
|
||||
Fixes [perl #132695].
|
||||
|
||||
Petr Písař: Ported to Data-Dumpe-2.167 from perl
|
||||
fb5043174b070927d312677f0a2f04a29b11349a.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
Dumper.xs | 11 ++++++-----
|
||||
t/dumper.t | 32 +++++++++++++++++++++++++++++++-
|
||||
2 files changed, 37 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Dumper.xs b/Dumper.xs
|
||||
index 8a16e04..206e8b5 100644
|
||||
--- a/Dumper.xs
|
||||
+++ b/Dumper.xs
|
||||
@@ -1300,11 +1300,11 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
i = 0; else i -= 4;
|
||||
}
|
||||
if (globname_needs_quote(c,i)) {
|
||||
- sv_grow(retval, SvCUR(retval)+2);
|
||||
+ sv_grow(retval, SvCUR(retval)+3);
|
||||
r = SvPVX(retval)+SvCUR(retval);
|
||||
- r[0] = '*'; r[1] = '{';
|
||||
+ r[0] = '*'; r[1] = '{'; r[2] = 0;
|
||||
SvCUR_set(retval, SvCUR(retval)+2);
|
||||
- esc_q_utf8(aTHX_ retval, c, i,
|
||||
+ i = 3 + esc_q_utf8(aTHX_ retval, c, i,
|
||||
#ifdef GvNAMEUTF8
|
||||
!!GvNAMEUTF8(val)
|
||||
#else
|
||||
@@ -1314,15 +1314,16 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
sv_grow(retval, SvCUR(retval)+2);
|
||||
r = SvPVX(retval)+SvCUR(retval);
|
||||
r[0] = '}'; r[1] = '\0';
|
||||
- i = 1;
|
||||
+ SvCUR_set(retval, SvCUR(retval)+1);
|
||||
+ r = r+1 - i;
|
||||
}
|
||||
else {
|
||||
sv_grow(retval, SvCUR(retval)+i+2);
|
||||
r = SvPVX(retval)+SvCUR(retval);
|
||||
r[0] = '*'; strcpy(r+1, c);
|
||||
i++;
|
||||
+ SvCUR_set(retval, SvCUR(retval)+i);
|
||||
}
|
||||
- SvCUR_set(retval, SvCUR(retval)+i);
|
||||
|
||||
if (style->purity) {
|
||||
static const char* const entries[] = { "{SCALAR}", "{ARRAY}", "{HASH}" };
|
||||
diff --git a/t/dumper.t b/t/dumper.t
|
||||
index 0c12f34..e09a2dd 100644
|
||||
--- a/t/dumper.t
|
||||
+++ b/t/dumper.t
|
||||
@@ -108,7 +108,7 @@ sub SKIP_TEST {
|
||||
++$TNUM; print "ok $TNUM # skip $reason\n";
|
||||
}
|
||||
|
||||
-$TMAX = 456;
|
||||
+$TMAX = 468;
|
||||
|
||||
# Force Data::Dumper::Dump to use perl. We test Dumpxs explicitly by calling
|
||||
# it direct. Out here it lets us knobble the next if to test that the perl
|
||||
@@ -1773,3 +1773,33 @@ EOT
|
||||
TEST (q(Data::Dumper->Dumpxs([\@globs], ["globs"])), 'globs: Dumpxs()')
|
||||
if $XS;
|
||||
}
|
||||
+#############
|
||||
+$WANT = <<'EOT';
|
||||
+#$v = {
|
||||
+# a => \*::ppp,
|
||||
+# b => \*{'::a/b'},
|
||||
+# c => \*{"::a\x{2603}b"}
|
||||
+#};
|
||||
+#*::ppp = {
|
||||
+# a => 1
|
||||
+#};
|
||||
+#*{'::a/b'} = {
|
||||
+# b => 3
|
||||
+#};
|
||||
+#*{"::a\x{2603}b"} = {
|
||||
+# c => 5
|
||||
+#};
|
||||
+EOT
|
||||
+{
|
||||
+ *ppp = { a => 1 };
|
||||
+ *{"a/b"} = { b => 3 };
|
||||
+ *{"a\x{2603}b"} = { c => 5 };
|
||||
+ our $v = { a => \*ppp, b => \*{"a/b"}, c => \*{"a\x{2603}b"} };
|
||||
+ local $Data::Dumper::Purity = 1;
|
||||
+ TEST (q(Data::Dumper->Dump([$v], ["v"])), 'glob purity: Dump()');
|
||||
+ TEST (q(Data::Dumper->Dumpxs([$v], ["v"])), 'glob purity: Dumpxs()') if $XS;
|
||||
+ $WANT =~ tr/'/"/;
|
||||
+ local $Data::Dumper::Useqq = 1;
|
||||
+ TEST (q(Data::Dumper->Dump([$v], ["v"])), 'glob purity: Dump()');
|
||||
+ TEST (q(Data::Dumper->Dumpxs([$v], ["v"])), 'glob purity: Dumpxs()') if $XS;
|
||||
+}
|
||||
--
|
||||
2.13.6
|
||||
|
||||
@ -0,0 +1,134 @@
|
||||
From 69beb4272d324bb0724b140b5ddca517e90d89b9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Tue, 5 Dec 2017 10:59:42 +0100
|
||||
Subject: [PATCH] in Data-Dumper, quote glob names better
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Ported to Data-Dumper-1.167 from perl git tree:
|
||||
|
||||
commit abda9fe0fe75ae824723761c1c98af958f17a41c
|
||||
Author: Zefram <zefram@fysh.org>
|
||||
Date: Fri Dec 1 17:35:35 2017 +0000
|
||||
|
||||
in Data-Dumper, quote glob names better
|
||||
|
||||
Glob name quoting should obey Useqq. Fixes [perl #119831].
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
Dumper.pm | 4 ++--
|
||||
Dumper.xs | 22 +++++++---------------
|
||||
t/dumper.t | 35 ++++++++++++++++++++++++++++++++++-
|
||||
3 files changed, 43 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/Dumper.pm b/Dumper.pm
|
||||
index 00f6326..696964a 100644
|
||||
--- a/Dumper.pm
|
||||
+++ b/Dumper.pm
|
||||
@@ -527,8 +527,8 @@ sub _dump {
|
||||
$ref = \$val;
|
||||
if (ref($ref) eq 'GLOB') { # glob
|
||||
my $name = substr($val, 1);
|
||||
- if ($name =~ /^[A-Za-z_][\w:]*$/ && $name ne 'main::') {
|
||||
- $name =~ s/^main::/::/;
|
||||
+ $name =~ s/^main::(?!\z)/::/;
|
||||
+ if ($name =~ /\A(?:[A-Z_a-z][0-9A-Z_a-z]*)?::(?:[0-9A-Z_a-z]+::)*[0-9A-Z_a-z]*\z/ && $name ne 'main::') {
|
||||
$sname = $name;
|
||||
}
|
||||
else {
|
||||
diff --git a/Dumper.xs b/Dumper.xs
|
||||
index 5a21721..8a16e04 100644
|
||||
--- a/Dumper.xs
|
||||
+++ b/Dumper.xs
|
||||
@@ -1300,29 +1300,21 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
i = 0; else i -= 4;
|
||||
}
|
||||
if (globname_needs_quote(c,i)) {
|
||||
-#ifdef GvNAMEUTF8
|
||||
- if (GvNAMEUTF8(val)) {
|
||||
sv_grow(retval, SvCUR(retval)+2);
|
||||
r = SvPVX(retval)+SvCUR(retval);
|
||||
r[0] = '*'; r[1] = '{';
|
||||
SvCUR_set(retval, SvCUR(retval)+2);
|
||||
- esc_q_utf8(aTHX_ retval, c, i, 1, style->useqq);
|
||||
+ esc_q_utf8(aTHX_ retval, c, i,
|
||||
+#ifdef GvNAMEUTF8
|
||||
+ !!GvNAMEUTF8(val)
|
||||
+#else
|
||||
+ 0
|
||||
+#endif
|
||||
+ , style->useqq);
|
||||
sv_grow(retval, SvCUR(retval)+2);
|
||||
r = SvPVX(retval)+SvCUR(retval);
|
||||
r[0] = '}'; r[1] = '\0';
|
||||
i = 1;
|
||||
- }
|
||||
- else
|
||||
-#endif
|
||||
- {
|
||||
- sv_grow(retval, SvCUR(retval)+6+2*i);
|
||||
- r = SvPVX(retval)+SvCUR(retval);
|
||||
- r[0] = '*'; r[1] = '{'; r[2] = '\'';
|
||||
- i += esc_q(r+3, c, i);
|
||||
- i += 3;
|
||||
- r[i++] = '\''; r[i++] = '}';
|
||||
- r[i] = '\0';
|
||||
- }
|
||||
}
|
||||
else {
|
||||
sv_grow(retval, SvCUR(retval)+i+2);
|
||||
diff --git a/t/dumper.t b/t/dumper.t
|
||||
index 643160a..0c12f34 100644
|
||||
--- a/t/dumper.t
|
||||
+++ b/t/dumper.t
|
||||
@@ -108,7 +108,7 @@ sub SKIP_TEST {
|
||||
++$TNUM; print "ok $TNUM # skip $reason\n";
|
||||
}
|
||||
|
||||
-$TMAX = 450;
|
||||
+$TMAX = 456;
|
||||
|
||||
# Force Data::Dumper::Dump to use perl. We test Dumpxs explicitly by calling
|
||||
# it direct. Out here it lets us knobble the next if to test that the perl
|
||||
@@ -1740,3 +1740,36 @@ EOT
|
||||
TEST (qq(Dumper("\n")), '\n alone');
|
||||
TEST (qq(Data::Dumper::DumperX("\n")), '\n alone') if $XS;
|
||||
}
|
||||
+#############
|
||||
+our @globs = map { $_, \$_ } map { *$_ } map { $_, "s::$_" }
|
||||
+ "foo", "\1bar", "L\x{e9}on", "m\x{100}cron", "snow\x{2603}";
|
||||
+$WANT = <<'EOT';
|
||||
+#$globs = [
|
||||
+# *::foo,
|
||||
+# \*::foo,
|
||||
+# *s::foo,
|
||||
+# \*s::foo,
|
||||
+# *{"::\1bar"},
|
||||
+# \*{"::\1bar"},
|
||||
+# *{"s::\1bar"},
|
||||
+# \*{"s::\1bar"},
|
||||
+# *{"::L\351on"},
|
||||
+# \*{"::L\351on"},
|
||||
+# *{"s::L\351on"},
|
||||
+# \*{"s::L\351on"},
|
||||
+# *{"::m\x{100}cron"},
|
||||
+# \*{"::m\x{100}cron"},
|
||||
+# *{"s::m\x{100}cron"},
|
||||
+# \*{"s::m\x{100}cron"},
|
||||
+# *{"::snow\x{2603}"},
|
||||
+# \*{"::snow\x{2603}"},
|
||||
+# *{"s::snow\x{2603}"},
|
||||
+# \*{"s::snow\x{2603}"}
|
||||
+#];
|
||||
+EOT
|
||||
+{
|
||||
+ local $Data::Dumper::Useqq = 1;
|
||||
+ TEST (q(Data::Dumper->Dump([\@globs], ["globs"])), 'globs: Dump()');
|
||||
+ TEST (q(Data::Dumper->Dumpxs([\@globs], ["globs"])), 'globs: Dumpxs()')
|
||||
+ if $XS;
|
||||
+}
|
||||
--
|
||||
2.13.6
|
||||
|
||||
@ -1,243 +0,0 @@
|
||||
From 900c00b2ae29aa10b5cf0b3b5c55aff7501fc382 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Cook <tony@develop-help.com>
|
||||
Date: Wed, 12 Aug 2020 16:20:16 +1000
|
||||
Subject: [PATCH 3/3] Data::Dumper (XS): use mortals to prevent leaks if magic
|
||||
throws
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
For example:
|
||||
|
||||
use Tie::Scalar;
|
||||
use Data::Dumper;
|
||||
sub T::TIESCALAR { bless {}, shift}
|
||||
sub T::FETCH { die }
|
||||
my $x;
|
||||
tie $x, "T" or die;
|
||||
while(1) {
|
||||
eval { () = Dumper( [ \$x ] ) };
|
||||
}
|
||||
|
||||
would leak various work SVs.
|
||||
|
||||
I start a new scope (ENTER/LEAVE) for most recursive DD_dump() calls
|
||||
so that the work SVs don't accumulate on the temps stack, for example
|
||||
if we're dumping a large array we'd end up with several SVs on the
|
||||
temp stack for each member of the array.
|
||||
|
||||
The exceptions are where I don't expect a large number of unreleased
|
||||
temps to accumulate, as with scalar or glob refs.
|
||||
|
||||
Petr Písař: Ported to Data-Dumper-2.173 from
|
||||
815b4be4ab7ae210f796fc9d29754e55fc0d1f0e perl commit.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
Dumper.xs | 52 ++++++++++++++++++++++++++++------------------------
|
||||
1 file changed, 28 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/Dumper.xs b/Dumper.xs
|
||||
index d4b34ad..65639ae 100644
|
||||
--- a/Dumper.xs
|
||||
+++ b/Dumper.xs
|
||||
@@ -808,12 +808,13 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
sv_catpvs(retval, "( ");
|
||||
if (style->indent >= 2) {
|
||||
blesspad = apad;
|
||||
- apad = newSVsv(apad);
|
||||
+ apad = sv_2mortal(newSVsv(apad));
|
||||
sv_x(aTHX_ apad, " ", 1, blesslen+2);
|
||||
}
|
||||
}
|
||||
|
||||
ipad = sv_x(aTHX_ Nullsv, SvPVX_const(style->xpad), SvCUR(style->xpad), level+1);
|
||||
+ sv_2mortal(ipad);
|
||||
|
||||
if (is_regex)
|
||||
{
|
||||
@@ -878,7 +879,7 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
realtype <= SVt_PVMG
|
||||
#endif
|
||||
) { /* scalar ref */
|
||||
- SV * const namesv = newSVpvs("${");
|
||||
+ SV * const namesv = sv_2mortal(newSVpvs("${"));
|
||||
sv_catpvn(namesv, name, namelen);
|
||||
sv_catpvs(namesv, "}");
|
||||
if (realpack) { /* blessed */
|
||||
@@ -892,7 +893,6 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
DD_dump(aTHX_ ival, SvPVX_const(namesv), SvCUR(namesv), retval, seenhv,
|
||||
postav, level+1, apad, style);
|
||||
}
|
||||
- SvREFCNT_dec(namesv);
|
||||
}
|
||||
else if (realtype == SVt_PVGV) { /* glob ref */
|
||||
SV * const namesv = newSVpvs("*{");
|
||||
@@ -908,9 +908,10 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
SSize_t ix = 0;
|
||||
const SSize_t ixmax = av_len((AV *)ival);
|
||||
|
||||
- SV * const ixsv = newSViv(0);
|
||||
+ SV * const ixsv = sv_2mortal(newSViv(0));
|
||||
/* allowing for a 24 char wide array index */
|
||||
New(0, iname, namelen+28, char);
|
||||
+ SAVEFREEPV(iname);
|
||||
(void) strlcpy(iname, name, namelen+28);
|
||||
inamelen = namelen;
|
||||
if (name[0] == '@') {
|
||||
@@ -940,7 +941,7 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
iname[inamelen++] = '-'; iname[inamelen++] = '>';
|
||||
}
|
||||
iname[inamelen++] = '['; iname[inamelen] = '\0';
|
||||
- totpad = newSVsv(style->sep);
|
||||
+ totpad = sv_2mortal(newSVsv(style->sep));
|
||||
sv_catsv(totpad, style->pad);
|
||||
sv_catsv(totpad, apad);
|
||||
|
||||
@@ -970,8 +971,12 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
}
|
||||
sv_catsv(retval, totpad);
|
||||
sv_catsv(retval, ipad);
|
||||
+ ENTER;
|
||||
+ SAVETMPS;
|
||||
DD_dump(aTHX_ elem, iname, ilen, retval, seenhv, postav,
|
||||
level+1, apad, style);
|
||||
+ FREETMPS;
|
||||
+ LEAVE;
|
||||
if (ix < ixmax || (style->trailingcomma && style->indent >= 1))
|
||||
sv_catpvs(retval, ",");
|
||||
}
|
||||
@@ -985,9 +990,6 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
sv_catpvs(retval, ")");
|
||||
else
|
||||
sv_catpvs(retval, "]");
|
||||
- SvREFCNT_dec(ixsv);
|
||||
- SvREFCNT_dec(totpad);
|
||||
- Safefree(iname);
|
||||
}
|
||||
else if (realtype == SVt_PVHV) {
|
||||
SV *totpad, *newapad;
|
||||
@@ -997,7 +999,7 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
SV *hval;
|
||||
AV *keys = NULL;
|
||||
|
||||
- SV * const iname = newSVpvn(name, namelen);
|
||||
+ SV * const iname = newSVpvn_flags(name, namelen, SVs_TEMP);
|
||||
if (name[0] == '%') {
|
||||
sv_catpvs(retval, "(");
|
||||
(SvPVX(iname))[0] = '$';
|
||||
@@ -1021,7 +1023,7 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
sv_catpvs(iname, "->");
|
||||
}
|
||||
sv_catpvs(iname, "{");
|
||||
- totpad = newSVsv(style->sep);
|
||||
+ totpad = sv_2mortal(newSVsv(style->sep));
|
||||
sv_catsv(totpad, style->pad);
|
||||
sv_catsv(totpad, apad);
|
||||
|
||||
@@ -1117,6 +1119,10 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
|
||||
sv_catsv(retval, totpad);
|
||||
sv_catsv(retval, ipad);
|
||||
+
|
||||
+ ENTER;
|
||||
+ SAVETMPS;
|
||||
+
|
||||
/* The (very)
|
||||
old logic was first to check utf8 flag, and if utf8 always
|
||||
call esc_q_utf8. This caused test to break under -Mutf8,
|
||||
@@ -1143,6 +1149,7 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
else {
|
||||
nticks = num_q(key, klen);
|
||||
New(0, nkey_buffer, klen+nticks+3, char);
|
||||
+ SAVEFREEPV(nkey_buffer);
|
||||
nkey = nkey_buffer;
|
||||
nkey[0] = '\'';
|
||||
if (nticks)
|
||||
@@ -1160,7 +1167,8 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
nlen = klen;
|
||||
sv_catpvn(retval, nkey, klen);
|
||||
}
|
||||
- sname = newSVsv(iname);
|
||||
+
|
||||
+ sname = sv_2mortal(newSVsv(iname));
|
||||
sv_catpvn(sname, nkey, nlen);
|
||||
sv_catpvs(sname, "}");
|
||||
|
||||
@@ -1168,7 +1176,7 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
if (style->indent >= 2) {
|
||||
char *extra;
|
||||
STRLEN elen = 0;
|
||||
- newapad = newSVsv(apad);
|
||||
+ newapad = sv_2mortal(newSVsv(apad));
|
||||
New(0, extra, klen+4+1, char);
|
||||
while (elen < (klen+4))
|
||||
extra[elen++] = ' ';
|
||||
@@ -1181,10 +1189,9 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
|
||||
DD_dump(aTHX_ hval, SvPVX_const(sname), SvCUR(sname), retval, seenhv,
|
||||
postav, level+1, newapad, style);
|
||||
- SvREFCNT_dec(sname);
|
||||
- Safefree(nkey_buffer);
|
||||
- if (style->indent >= 2)
|
||||
- SvREFCNT_dec(newapad);
|
||||
+
|
||||
+ FREETMPS;
|
||||
+ LEAVE;
|
||||
}
|
||||
if (i) {
|
||||
SV *opad = sv_x(aTHX_ Nullsv, SvPVX_const(style->xpad),
|
||||
@@ -1199,8 +1206,6 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
sv_catpvs(retval, ")");
|
||||
else
|
||||
sv_catpvs(retval, "}");
|
||||
- SvREFCNT_dec(iname);
|
||||
- SvREFCNT_dec(totpad);
|
||||
}
|
||||
else if (realtype == SVt_PVCV) {
|
||||
if (style->deparse) {
|
||||
@@ -1247,7 +1252,6 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
STRLEN plen, pticks;
|
||||
|
||||
if (style->indent >= 2) {
|
||||
- SvREFCNT_dec(apad);
|
||||
apad = blesspad;
|
||||
}
|
||||
sv_catpvs(retval, ", '");
|
||||
@@ -1276,7 +1280,6 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
sv_catpvs(retval, "()");
|
||||
}
|
||||
}
|
||||
- SvREFCNT_dec(ipad);
|
||||
}
|
||||
else {
|
||||
STRLEN i;
|
||||
@@ -1671,20 +1674,21 @@ Data_Dumper_Dumpxs(href, ...)
|
||||
|
||||
if (style.indent >= 2 && !terse) {
|
||||
SV * const tmpsv = sv_x(aTHX_ NULL, " ", 1, SvCUR(name)+3);
|
||||
- newapad = newSVsv(apad);
|
||||
+ newapad = sv_2mortal(newSVsv(apad));
|
||||
sv_catsv(newapad, tmpsv);
|
||||
SvREFCNT_dec(tmpsv);
|
||||
}
|
||||
else
|
||||
newapad = apad;
|
||||
|
||||
+ ENTER;
|
||||
+ SAVETMPS;
|
||||
PUTBACK;
|
||||
DD_dump(aTHX_ val, SvPVX_const(name), SvCUR(name), valstr, seenhv,
|
||||
postav, 0, newapad, &style);
|
||||
SPAGAIN;
|
||||
-
|
||||
- if (style.indent >= 2 && !terse)
|
||||
- SvREFCNT_dec(newapad);
|
||||
+ FREETMPS;
|
||||
+ LEAVE;
|
||||
|
||||
postlen = av_len(postav);
|
||||
if (postlen >= 0 || !terse) {
|
||||
--
|
||||
2.25.4
|
||||
|
||||
@ -1,167 +0,0 @@
|
||||
From d9c4b4ae5a1a17347ff5e3ecbf8e1d9da481f476 Mon Sep 17 00:00:00 2001
|
||||
From: David Mitchell <davem@iabyn.com>
|
||||
Date: Wed, 3 Apr 2019 13:23:24 +0100
|
||||
Subject: [PATCH] Data::Dumper - avoid leak on croak
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
v5.21.3-742-g19be3be696 added a facility to Dumper.xs to croak if the
|
||||
recursion level became too deep (1000 by default).
|
||||
|
||||
The trouble with this is that various parts of DD_dump() allocate
|
||||
temporary SVs and buffers, which will leak if DD_dump() unceremoniously
|
||||
just croaks().
|
||||
|
||||
This currently manifests as dist/Data-Dumper/t/recurse.t failing under
|
||||
Address Sanitiser.
|
||||
|
||||
This commit makes the depth checking code just set a sticky 'too deep'
|
||||
boolean flag, and
|
||||
a) on entry, DD_dump() just returns immediately if the flag is set;
|
||||
b) the flag is checked by the top-level called of DD_dump() and croaks
|
||||
if set.
|
||||
|
||||
So the net effect is to defer croaking until the dump is complete,
|
||||
and avoid any further recursion once the flag is set.
|
||||
|
||||
This is a bit of a quick fix. More long-term solutions would be to
|
||||
convert DD_dump() to be iterative rather than recursive, and/or make
|
||||
sure all temporary SVs and buffers are suitably anchored somewhere so
|
||||
that they get cleaned up on croak.
|
||||
|
||||
Petr Písař: Ported from 6d65cb5d847ac93680949c4fa02111808207fbdc in
|
||||
perl git tree.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
Dumper.pm | 6 +++---
|
||||
Dumper.xs | 27 ++++++++++++++++++++-------
|
||||
2 files changed, 23 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/Dumper.pm b/Dumper.pm
|
||||
index 40aeb7d..06af4c4 100644
|
||||
--- a/Dumper.pm
|
||||
+++ b/Dumper.pm
|
||||
@@ -10,7 +10,7 @@
|
||||
package Data::Dumper;
|
||||
|
||||
BEGIN {
|
||||
- $VERSION = '2.173'; # Don't forget to set version and release
|
||||
+ $VERSION = '2.174'; # Don't forget to set version and release
|
||||
} # date in POD below!
|
||||
|
||||
#$| = 1;
|
||||
@@ -1461,13 +1461,13 @@ be to use the C<Sortkeys> filter of Data::Dumper.
|
||||
|
||||
Gurusamy Sarathy gsar@activestate.com
|
||||
|
||||
-Copyright (c) 1996-2017 Gurusamy Sarathy. All rights reserved.
|
||||
+Copyright (c) 1996-2019 Gurusamy Sarathy. All rights reserved.
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the same terms as Perl itself.
|
||||
|
||||
=head1 VERSION
|
||||
|
||||
-Version 2.173
|
||||
+Version 2.174
|
||||
|
||||
=head1 SEE ALSO
|
||||
|
||||
diff --git a/Dumper.xs b/Dumper.xs
|
||||
index 7f0b027..a324cb6 100644
|
||||
--- a/Dumper.xs
|
||||
+++ b/Dumper.xs
|
||||
@@ -61,9 +61,10 @@
|
||||
#endif
|
||||
|
||||
/* This struct contains almost all the user's desired configuration, and it
|
||||
- * is treated as constant by the recursive function. This arrangement has
|
||||
- * the advantage of needing less memory than passing all of them on the
|
||||
- * stack all the time (as was the case in an earlier implementation). */
|
||||
+ * is treated as mostly constant (except for maxrecursed) by the recursive
|
||||
+ * function. This arrangement has the advantage of needing less memory
|
||||
+ * than passing all of them on the stack all the time (as was the case in
|
||||
+ * an earlier implementation). */
|
||||
typedef struct {
|
||||
SV *pad;
|
||||
SV *xpad;
|
||||
@@ -74,6 +75,7 @@ typedef struct {
|
||||
SV *toaster;
|
||||
SV *bless;
|
||||
IV maxrecurse;
|
||||
+ bool maxrecursed; /* at some point we exceeded the maximum recursion level */
|
||||
I32 indent;
|
||||
I32 purity;
|
||||
I32 deepcopy;
|
||||
@@ -97,7 +99,7 @@ static bool safe_decimal_number(const char *p, STRLEN len);
|
||||
static SV *sv_x (pTHX_ SV *sv, const char *str, STRLEN len, I32 n);
|
||||
static I32 DD_dump (pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval,
|
||||
HV *seenhv, AV *postav, const I32 level, SV *apad,
|
||||
- const Style *style);
|
||||
+ Style *style);
|
||||
|
||||
#ifndef HvNAME_get
|
||||
#define HvNAME_get HvNAME
|
||||
@@ -615,7 +617,7 @@ deparsed_output(pTHX_ SV *val)
|
||||
*/
|
||||
static I32
|
||||
DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
- AV *postav, const I32 level, SV *apad, const Style *style)
|
||||
+ AV *postav, const I32 level, SV *apad, Style *style)
|
||||
{
|
||||
char tmpbuf[128];
|
||||
Size_t i;
|
||||
@@ -642,6 +644,9 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
if (!val)
|
||||
return 0;
|
||||
|
||||
+ if (style->maxrecursed)
|
||||
+ return 0;
|
||||
+
|
||||
/* If the output buffer has less than some arbitrary amount of space
|
||||
remaining, then enlarge it. For the test case (25M of output),
|
||||
*1.1 was slower, *2.0 was the same, so the first guess of 1.5 is
|
||||
@@ -793,7 +798,7 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
|
||||
}
|
||||
|
||||
if (style->maxrecurse > 0 && level >= style->maxrecurse) {
|
||||
- croak("Recursion limit of %" IVdf " exceeded", style->maxrecurse);
|
||||
+ style->maxrecursed = TRUE;
|
||||
}
|
||||
|
||||
if (realpack && !no_bless) { /* we have a blessed ref */
|
||||
@@ -1528,6 +1533,7 @@ Data_Dumper_Dumpxs(href, ...)
|
||||
style.indent = 2;
|
||||
style.quotekeys = 1;
|
||||
style.maxrecurse = 1000;
|
||||
+ style.maxrecursed = FALSE;
|
||||
style.purity = style.deepcopy = style.useqq = style.maxdepth
|
||||
= style.use_sparse_seen_hash = style.trailingcomma = 0;
|
||||
style.pad = style.xpad = style.sep = style.pair = style.sortkeys
|
||||
@@ -1675,7 +1681,7 @@ Data_Dumper_Dumpxs(href, ...)
|
||||
DD_dump(aTHX_ val, SvPVX_const(name), SvCUR(name), valstr, seenhv,
|
||||
postav, 0, newapad, &style);
|
||||
SPAGAIN;
|
||||
-
|
||||
+
|
||||
if (style.indent >= 2 && !terse)
|
||||
SvREFCNT_dec(newapad);
|
||||
|
||||
@@ -1715,6 +1721,13 @@ Data_Dumper_Dumpxs(href, ...)
|
||||
}
|
||||
SvREFCNT_dec(postav);
|
||||
SvREFCNT_dec(valstr);
|
||||
+
|
||||
+ /* we defer croaking until here so that temporary SVs and
|
||||
+ * buffers won't be leaked */
|
||||
+ if (style.maxrecursed)
|
||||
+ croak("Recursion limit of %" IVdf " exceeded",
|
||||
+ style.maxrecurse);
|
||||
+
|
||||
}
|
||||
else
|
||||
croak("Call to new() method failed to return HASH ref");
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
From 65ec73b1bc79648a2daeb494552ce0b0b90348d7 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Cook <tony@develop-help.com>
|
||||
Date: Mon, 10 Aug 2020 16:26:30 +1000
|
||||
Subject: [PATCH 1/3] Data::Dumper: don't leak the working retval
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
do this by mortalizing the SV on creation, rather than when we
|
||||
push it on the stack
|
||||
|
||||
Petr Písař: Ported to Data-Dumper-2.173 from
|
||||
41463160be4baa0d81d9d8297508a1b9bdcaa206 perl commit.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
Dumper.xs | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Dumper.xs b/Dumper.xs
|
||||
index a324cb6..f91145a 100644
|
||||
--- a/Dumper.xs
|
||||
+++ b/Dumper.xs
|
||||
@@ -1541,7 +1541,7 @@ Data_Dumper_Dumpxs(href, ...)
|
||||
seenhv = NULL;
|
||||
name = sv_newmortal();
|
||||
|
||||
- retval = newSVpvs("");
|
||||
+ retval = newSVpvs_flags("", SVs_TEMP);
|
||||
if (SvROK(href)
|
||||
&& (hv = (HV*)SvRV((SV*)href))
|
||||
&& SvTYPE(hv) == SVt_PVHV) {
|
||||
@@ -1714,9 +1714,9 @@ Data_Dumper_Dumpxs(href, ...)
|
||||
}
|
||||
SvPVCLEAR(valstr);
|
||||
if (gimme == G_ARRAY) {
|
||||
- XPUSHs(sv_2mortal(retval));
|
||||
+ XPUSHs(retval);
|
||||
if (i < imax) /* not the last time thro ? */
|
||||
- retval = newSVpvs("");
|
||||
+ retval = newSVpvs_flags("", SVs_TEMP);
|
||||
}
|
||||
}
|
||||
SvREFCNT_dec(postav);
|
||||
@@ -1732,7 +1732,7 @@ Data_Dumper_Dumpxs(href, ...)
|
||||
else
|
||||
croak("Call to new() method failed to return HASH ref");
|
||||
if (gimme != G_ARRAY)
|
||||
- XPUSHs(sv_2mortal(retval));
|
||||
+ XPUSHs(retval);
|
||||
}
|
||||
|
||||
SV *
|
||||
--
|
||||
2.25.4
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
From 21e67795792e5e1d25bcbd3b167ed18d0d6dc7b4 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Cook <tony@develop-help.com>
|
||||
Date: Tue, 11 Aug 2020 10:46:38 +1000
|
||||
Subject: [PATCH 2/3] make postav and valstr mortal so they're freed soonish
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
these can leak if the value being dumped (or any part of it)
|
||||
had get magic and that magic throws an exception.
|
||||
|
||||
Several other SVs can also leak in that case, but cleaning those up
|
||||
is more complex.
|
||||
|
||||
Petr Písař: Ported to Data-Dumper-2.173 from
|
||||
b98a3a6d08f681353d0b357fd1cce437c93656e7 perl commit.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
Dumper.xs | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Dumper.xs b/Dumper.xs
|
||||
index f91145a..d4b34ad 100644
|
||||
--- a/Dumper.xs
|
||||
+++ b/Dumper.xs
|
||||
@@ -1613,12 +1613,13 @@ Data_Dumper_Dumpxs(href, ...)
|
||||
style.sortkeys = &PL_sv_yes;
|
||||
}
|
||||
postav = newAV();
|
||||
+ sv_2mortal((SV*)postav);
|
||||
|
||||
if (todumpav)
|
||||
imax = av_len(todumpav);
|
||||
else
|
||||
imax = -1;
|
||||
- valstr = newSVpvs("");
|
||||
+ valstr = newSVpvs_flags("", SVs_TEMP);
|
||||
for (i = 0; i <= imax; ++i) {
|
||||
SV *newapad;
|
||||
|
||||
@@ -1719,8 +1720,6 @@ Data_Dumper_Dumpxs(href, ...)
|
||||
retval = newSVpvs_flags("", SVs_TEMP);
|
||||
}
|
||||
}
|
||||
- SvREFCNT_dec(postav);
|
||||
- SvREFCNT_dec(valstr);
|
||||
|
||||
/* we defer croaking until here so that temporary SVs and
|
||||
* buffers won't be leaked */
|
||||
--
|
||||
2.25.4
|
||||
|
||||
Loading…
Reference in new issue