[win32] merge change#905 from maintbranch, minor fixes to get

clean build+test on Solaris

p4raw-link: @905 on //depot/maint-5.004/perl: 15e73149a8419f18d739227762eab108524cec56

p4raw-id: //depot/win32/perl@976

1 files changed, 2 insertions, 1 deletions

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