merge changes#1210,1211,1270 from maintbranch

p4raw-link: @1270 on //depot/maint-5.004/perl: 413603941653f55130af336b8e990052b26673a6
p4raw-link: @1211 on //depot/maint-5.004/perl: 247620c138019426962998dd7edc0157874220f0
p4raw-link: @1210 on //depot/maint-5.004/perl: 4522f71f5c16bf8892b1952004accec53aab868e

p4raw-id: //depot/perl@1277

1 files changed, 1 insertions, 2 deletions

diff --git a/mg.c b/mg.c
index 4f0616f6c9..b3dde0e246 100644
--- a/mg.c
+++ b/mg.c
@@ -478,8 +478,7 @@ magic_get(SV *sv, MAGIC *mg)
 		    }
 		    sv_setpvn(sv,s,i);
 		    if (tainting)
-			tainted = (was_tainted || RX_MATCH_TAINTED(rx) ||
-				   (curpm->op_pmflags & PMf_TAINTMEM));
+			tainted = (was_tainted || RX_MATCH_TAINTED(rx));
 		    break;
 		}
 	    }