Change 11755 by sky@sky-borderline on 2001/08/27 05:37:17
Plugs a memory leak on destruction of regular expressions
introcued by #11274.
PL_regex_padav now has an AV as it's first entry with a list
of freed regex_padav slots that it will reuse on creating
new PMOPs.
Affected files ...
... //depot/perl/op.c#431 edit
... //depot/perl/perl.c#361 edit
Differences ...
==== //depot/perl/op.c#431 (text) ====
Index: perl/op.c
--- perl/op.c.~1~ Sun Aug 26 23:45:05 2001
+++ perl/op.c Sun Aug 26 23:45:05 2001
@@ -747,6 +747,7 @@
void
Perl_op_clear(pTHX_ OP *o)
{
+
switch (o->op_type) {
case OP_NULL: /* Was holding old type, if any. */
case OP_ENTEREVAL: /* Was holding hints. */
@@ -860,6 +861,13 @@
*/
ReREFCNT_dec(PM_GETRE_SAFE(cPMOPo));
PM_SETRE_SAFE(cPMOPo, (REGEXP*)NULL);
+#ifdef USE_ITHREADS
+ if(PL_regex_pad) { /* We could be in destruction */
+ av_push((AV*) PL_regex_pad[0],(SV*) PL_regex_pad[(cPMOPo)->op_pmoffset]);
+ PM_SETRE(cPMOPo, (cPMOPo)->op_pmoffset);
+ }
+#endif
+
break;
}
@@ -2962,12 +2970,19 @@
pmop->op_pmflags = pmop->op_pmpermflags;
#ifdef USE_ITHREADS
- {
- SV* repointer = newSViv(0);
- av_push(PL_regex_padav,SvREFCNT_inc(repointer));
- pmop->op_pmoffset = av_len(PL_regex_padav);
- PL_regex_pad = AvARRAY(PL_regex_padav);
+ {
+ SV* repointer;
+ if(av_len((AV*) PL_regex_pad[0]) > -1) {
+ repointer = av_pop((AV*)PL_regex_pad[0]);
+ pmop->op_pmoffset = SvIV(repointer);
+ sv_setiv(repointer,0);
+ } else {
+ repointer = newSViv(0);
+ av_push(PL_regex_padav,SvREFCNT_inc(repointer));
+ pmop->op_pmoffset = av_len(PL_regex_padav);
+ PL_regex_pad = AvARRAY(PL_regex_padav);
}
+ }
#endif
/* link into pm list */
==== //depot/perl/perl.c#361 (text) ====
Index: perl/perl.c
--- perl/perl.c.~1~ Sun Aug 26 23:45:05 2001
+++ perl/perl.c Sun Aug 26 23:45:05 2001
@@ -284,7 +284,9 @@
PL_modglobal = newHV(); /* pointers to per-interpreter module globals
*/
PL_errors = newSVpvn("",0);
#ifdef USE_ITHREADS
- PL_regex_padav = newAV();
+ PL_regex_padav = newAV();
+ av_push(PL_regex_padav,(SV*)newAV()); /* First entry is an array of empty
+elements */
+ PL_regex_pad = AvARRAY(PL_regex_padav);
#endif
#ifdef USE_REENTRANT_API
New(31337, PL_reentrant_buffer,1, REBUF);
End of Patch.
