summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@gmail.com>2008-01-09 16:52:36 +0000
committerRafael Garcia-Suarez <rgarciasuarez@gmail.com>2008-01-09 16:52:36 +0000
commitd6106309316e968d31ba656a7033bd0d45f70b22 (patch)
treea7c1a02e1e9a561ccb0e0845267645b7b9e9e691
parentc2dedb93787513d66c49e180154d0200519dbf74 (diff)
downloadperl-d6106309316e968d31ba656a7033bd0d45f70b22.tar.gz
Revert change #32920, since it was solved another way by #32890.
p4raw-link: @32920 on //depot/perl: e3dd4663a7a9c4d106a591d5b1511f7c9d1bfa1e p4raw-id: //depot/perl@32922
-rw-r--r--pp_ctl.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/pp_ctl.c b/pp_ctl.c
index d90d6250cd..07f8504fb5 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -212,8 +212,7 @@ PP(pp_substcont)
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 @@ PP(pp_substcont)
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 @@ S_make_matcher(pTHX_ REGEXP *re)
{
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;