Change 32922 by [EMAIL PROTECTED] on 2008/01/09 16:52:36
Revert change #32920, since it was solved another way by #32890.
Affected files ...
... //depot/perl/pp_ctl.c#654 edit
Differences ...
==== //depot/perl/pp_ctl.c#654 (text) ====
Index: perl/pp_ctl.c
--- perl/pp_ctl.c#653~32920~ 2008-01-09 08:32:55.000000000 -0800
+++ perl/pp_ctl.c 2008-01-09 08:52:36.000000000 -0800
@@ -212,8 +212,7 @@
if(old != rx) {
if(old)
ReREFCNT_dec(old);
- ReREFCNT_inc(rx);
- PM_SETRE(pm,rx);
+ PM_SETRE(pm,ReREFCNT_inc(rx));
}
rxres_restore(&cx->sb_rxres, rx);
@@ -310,7 +309,7 @@
mg->mg_len = i;
}
if (old != rx)
- ReREFCNT_inc(rx);
+ (void)ReREFCNT_inc(rx);
cx->sb_rxtainted |= RX_MATCH_TAINTED(rx);
rxres_save(&cx->sb_rxres, rx);
RETURNOP(pm->op_pmstashstartu.op_pmreplstart);
@@ -3829,8 +3828,7 @@
{
dVAR;
PMOP *matcher = (PMOP *) newPMOP(OP_MATCH, OPf_WANT_SCALAR | OPf_STACKED);
- ReREFCNT_inc(re);
- PM_SETRE(matcher, re);
+ PM_SETRE(matcher, ReREFCNT_inc(re));
SAVEFREEOP((OP *) matcher);
ENTER; SAVETMPS;
End of Patch.
