2015-06-23 21:23:16 +02:00
|
|
|
--- ./regcomp.c.orig 2015-05-13 22:19:30.000000000 +0200
|
|
|
|
+++ ./regcomp.c 2015-06-02 09:01:18.881114678 +0200
|
|
|
|
@@ -17744,8 +17744,21 @@
|
2011-05-16 16:18:55 +02:00
|
|
|
|
2015-06-23 21:23:16 +02:00
|
|
|
if (gvp) {
|
|
|
|
GV * const gv = *gvp;
|
|
|
|
- if (SvTYPE(gv) == SVt_PVGV && GvSV(gv))
|
|
|
|
- save_scalar(gv);
|
|
|
|
+ if (SvTYPE(gv) == SVt_PVGV && GvSV(gv)) {
|
|
|
|
+ /* this is a copy of save_scalar() without the GETMAGIC call, RT#76538 */
|
|
|
|
+ SV ** const sptr = &GvSVn(gv);
|
|
|
|
+ SV * osv = *sptr;
|
|
|
|
+ SV * nsv = newSV(0);
|
|
|
|
+ save_pushptrptr(SvREFCNT_inc_simple(gv), SvREFCNT_inc(osv), SAVEt_SV);
|
|
|
|
+ if (SvTYPE(osv) >= SVt_PVMG && SvMAGIC(osv)) {
|
|
|
|
+ if (SvGMAGICAL(osv)) {
|
|
|
|
+ SvFLAGS(osv) |= (SvFLAGS(osv) &
|
|
|
|
+ (SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT;
|
2011-05-16 16:18:55 +02:00
|
|
|
+ }
|
2015-06-23 21:23:16 +02:00
|
|
|
+ mg_localize(osv, nsv, (bool)1);
|
|
|
|
+ }
|
|
|
|
+ *sptr = nsv;
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|