diff options
| author | Father Chrysostomos <sprout@cpan.org> | 2012-08-05 13:13:12 -0700 |
|---|---|---|
| committer | Father Chrysostomos <sprout@cpan.org> | 2012-08-05 16:02:17 -0700 |
| commit | c782dc1db597b30ceb55455cfa926e7c4b620944 (patch) | |
| tree | a45d8c5acae501c9867d1dde611488ad7a557490 | |
| parent | f922571b226d9a59e677b263d6fda481db5611c4 (diff) | |
| download | perl-c782dc1db597b30ceb55455cfa926e7c4b620944.tar.gz | |
Don’t crash when undefining handle of active format
format FOO =
@
undef *STDOUT
.
$~ = FOO;
write
Commit 7ef822cddfe9 began the work by putting in a null check and a
goto (to bypass the top format), but the goto wentto some code that
lacked the null check. (It did actually fix the case of a IO with no
ofp, but not the case of a GV with no IO.) Interestingly, it added a
bad_ofp label, but did not add the code to goto it (an oversight?).
The unused bad_ofp label was commented out in commit 9cbac4c72b52.
There was already a check before 7ef822cddfe9 to see whether there was
an ofp, but only after the format scope has been popped.
This commit extends that check by making sure there is an io first.
It removes the commented-out bad_ofp label.
| -rw-r--r-- | pp_sys.c | 6 | ||||
| -rw-r--r-- | t/op/write.t | 12 |
2 files changed, 12 insertions, 6 deletions
@@ -1477,9 +1477,8 @@ PP(pp_leavewrite) SP = newsp; /* ignore retval of formline */ LEAVE; - fp = IoOFP(io); - if (!fp) { - if (IoIFP(io)) + if (!io || !(fp = IoOFP(io))) { + if (io && IoIFP(io)) report_wrongway_fh(gv, '<'); else report_evil_fh(gv); @@ -1500,7 +1499,6 @@ PP(pp_leavewrite) PUSHs(&PL_sv_yes); } } - /* bad_ofp: */ PL_formtarget = PL_bodytarget; PERL_UNUSED_VAR(gimme); RETURNOP(retop); diff --git a/t/op/write.t b/t/op/write.t index 6c16191878..a648902fb5 100644 --- a/t/op/write.t +++ b/t/op/write.t @@ -61,7 +61,7 @@ for my $tref ( @NumTests ){ my $bas_tests = 20; # number of tests in section 3 -my $bug_tests = 8 + 3 * 3 * 5 * 2 * 3 + 2 + 66 + 4 + 2 + 3 + 96 + 1; +my $bug_tests = 8 + 3 * 3 * 5 * 2 * 3 + 2 + 66 + 4 + 2 + 3 + 96 + 2; # number of tests in section 4 my $hmb_tests = 35; @@ -992,7 +992,15 @@ undef *UNDEFFORMAT . write UNDEF; pass "active format cannot be freed"; -close UNDEF or die "Could not close: $!"; + +select +(select(UNDEF), $~ = "UNDEFFORMAT2")[0]; +format UNDEFFORMAT2 = +@ +close UNDEF or die "Could not close: $!"; undef *UNDEF +. +write UNDEF; +pass "freeing current handle in format"; +undef $^A; ############################# |