From 04ca4930675dbe212bae84041b9a725458ccf5b8 Mon Sep 17 00:00:00 2001 From: Nicholas Clark Date: Tue, 21 Jan 2003 22:27:21 +0000 Subject: [PATCH] Re: [perl #9394] Re: [ID 20020525.002] coredump/ bad free warning in blead with SIGWARN Message-ID: <20030121222720.GG293@Bagpuss.unfortu.net> p4raw-id: //depot/perl@18557 --- sv.c | 4 +++- t/op/ref.t | 41 +++++++++++++++++++++++++++++++---------- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/sv.c b/sv.c index 36c9f80..ce7540c 100644 --- a/sv.c +++ b/sv.c @@ -7883,7 +7883,9 @@ Perl_sv_unref_flags(pTHX_ SV *sv, U32 flags) } SvRV(sv) = 0; SvROK_off(sv); - if (SvREFCNT(rv) != 1 || SvREADONLY(rv) || (flags & SV_IMMEDIATE_UNREF)) + /* You can't have a || SvREADONLY(rv) here, as $a = $$a, where $a was + assigned to as BEGIN {$a = \"Foo"} will fail. */ + if (SvREFCNT(rv) != 1 || (flags & SV_IMMEDIATE_UNREF)) SvREFCNT_dec(rv); else /* XXX Hack, but hard to make $a=$a->[1] work otherwise */ sv_2mortal(rv); /* Schedule for freeing later */ diff --git a/t/op/ref.t b/t/op/ref.t index 1205a7a..9470efa 100755 --- a/t/op/ref.t +++ b/t/op/ref.t @@ -5,7 +5,7 @@ BEGIN { @INC = qw(. ../lib); } -print "1..63\n"; +print "1..65\n"; require 'test.pl'; @@ -296,23 +296,44 @@ $a = $a->[1]; print "not " unless $a == 2; print "ok 55\n"; -sub x::DESTROY {print "ok ", 55 + shift->[0], "\n"} -{ my $a1 = bless [4],"x"; - my $a2 = bless [3],"x"; - { my $a3 = bless [2],"x"; - my $a4 = bless [1],"x"; - 567; +# This test used to coredump. The BEGIN block is important as it causes the +# op that created the constant reference to be freed. Hence the only +# reference to the constant string "pass" is in $a. The hack that made +# sure $a = $a->[1] would work didn't work with references to constants. + +my $test = 56; + +foreach my $lexical ('', 'my $a; ') { + my $expect = "pass\n"; + my $result = runperl (switches => ['-wl'], stderr => 1, + prog => $lexical . 'BEGIN {$a = \q{pass}}; $a = $$a; print $a'); + + if ($? == 0 and $result eq $expect) { + print "ok $test\n"; + } else { + print "not ok $test # \$? = $?\n"; + print "# expected ", _qq ($expect), ", got ", _qq ($result), "\n"; } + $test++; } +sub x::DESTROY {print "ok ", $test + shift->[0], "\n"} +{ my $a1 = bless [3],"x"; + my $a2 = bless [2],"x"; + { my $a3 = bless [1],"x"; + my $a4 = bless [0],"x"; + 567; + } +} +$test+=4; my $result = runperl (switches=>['-l'], prog=> 'print 1; print qq-*$\*-;print 1;'); my $expect = "1\n*\n*\n1\n"; if ($result eq $expect) { - print "ok 60\n"; + print "ok $test\n"; } else { - print "not ok 60\n"; + print "not ok $test\n"; foreach ($expect, $result) { s/\n/\\n/gs; } @@ -321,7 +342,7 @@ if ($result eq $expect) { # test global destruction -my $test = 61; +++$test; my $test1 = $test + 1; my $test2 = $test + 2; -- 2.7.4