Skip to content

Commit

Permalink
[perl #54956] crash on binary-or lvalue operation on qr//
Browse files Browse the repository at this point in the history
This fixes the following problem:

  -e 'my $re = qr/x/; $re |= "y"'
  assert failure under 5.10.0, 10-maint, bleed, but not 5.8.8
  • Loading branch information
mauzo authored and rgs committed Jan 2, 2009
1 parent 50eca76 commit 8c8eee8
Show file tree
Hide file tree
Showing 2 changed files with 110 additions and 2 deletions.
8 changes: 7 additions & 1 deletion doop.c
Expand Up @@ -1231,7 +1231,13 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right)

if (sv != left || (optype != OP_BIT_AND && !SvOK(sv) && !SvGMAGICAL(sv)))
sv_setpvs(sv, ""); /* avoid undef warning on |= and ^= */
lsave = lc = SvPV_nomg_const(left, leftlen);
if (sv == left) {
lsave = lc = SvPV_force_nomg(left, leftlen);
}
else {
lsave = lc = SvPV_nomg_const(left, leftlen);
SvPV_force_nomg_nolen(sv);
}
rsave = rc = SvPV_nomg_const(right, rightlen);

/* This need to come after SvPV to ensure that string overloading has
Expand Down
104 changes: 103 additions & 1 deletion t/op/bop.t
Expand Up @@ -15,7 +15,7 @@ BEGIN {
# If you find tests are failing, please try adding names to tests to track
# down where the failure is, and supply your new names as a patch.
# (Just-in-time test naming)
plan tests => 161;
plan tests => 161 + (10*13*2) + 4;

# numerics
ok ((0xdead & 0xbeef) == 0x9ead);
Expand Down Expand Up @@ -428,3 +428,105 @@ SKIP: {
my $ref = "\x{10000}\0";
is(~~$str, $ref);
}

# ref tests

my %res;

for my $str ("x", "\x{100}") {
for my $chr (qw/S A H G X ( * F/) {
for my $op (qw/| & ^/) {
my $co = ord $chr;
my $so = ord $str;
$res{"$chr$op$str"} = eval qq/chr($co $op $so)/;
}
}
$res{"undef|$str"} = $str;
$res{"undef&$str"} = "";
$res{"undef^$str"} = $str;
}

sub PVBM () { "X" }
index PVBM, "foo";

my $warn = 0;
local $^W = 1;
local $SIG{__WARN__} = sub { $warn++ };

sub is_first {
my ($got, $orig, $op, $str, $name) = @_;
is(substr($got, 0, 1), $res{"$orig$op$str"}, $name);
}

for (
# [object to test, first char of stringification, name]
[undef, "undef", "undef" ],
[\1, "S", "scalar ref" ],
[[], "A", "array ref" ],
[{}, "H", "hash ref" ],
[qr/x/, "(", "qr//" ],
[*foo, "*", "glob" ],
[\*foo, "G", "glob ref" ],
[PVBM, "X", "PVBM" ],
[\PVBM, "S", "PVBM ref" ],
[bless([], "Foo"), "F", "object" ],
) {
my ($val, $orig, $type) = @$_;

for (["x", "string"], ["\x{100}", "utf8"]) {
my ($str, $desc) = @$_;

$warn = 0;

is_first($val | $str, $orig, "|", $str, "$type | $desc");
is_first($val & $str, $orig, "&", $str, "$type & $desc");
is_first($val ^ $str, $orig, "^", $str, "$type ^ $desc");

is_first($str | $val, $orig, "|", $str, "$desc | $type");
is_first($str & $val, $orig, "&", $str, "$desc & $type");
is_first($str ^ $val, $orig, "^", $str, "$desc ^ $type");

my $new;
($new = $val) |= $str;
is_first($new, $orig, "|", $str, "$type |= $desc");
($new = $val) &= $str;
is_first($new, $orig, "&", $str, "$type &= $desc");
($new = $val) ^= $str;
is_first($new, $orig, "^", $str, "$type ^= $desc");

($new = $str) |= $val;
is_first($new, $orig, "|", $str, "$desc |= $type");
($new = $str) &= $val;
is_first($new, $orig, "&", $str, "$desc &= $type");
($new = $str) ^= $val;
is_first($new, $orig, "^", $str, "$desc ^= $type");

if ($orig eq "undef") {
# undef |= and undef ^= don't warn
is($warn, 10, "no duplicate warnings");
}
else {
is($warn, 0, "no warnings");
}
}
}

my $strval;

{
package Bar;
use overload q/""/ => sub { $strval };

package Baz;
use overload q/|/ => sub { "y" };
}

ok(!eval { bless([], "Bar") | "x"; 1 }, "string overload can't use |");
like($@, qr/no method found/, "correct error");
is(eval { bless([], "Baz") | "x" }, "y", "| overload works");

my $obj = bless [], "Bar";
$strval = "x";
eval { $obj |= "Q" };
$strval = "z";
is("$obj", "z", "|= doesn't break string overload");

0 comments on commit 8c8eee8

Please sign in to comment.