Initial 3-way merge from (5.001m, thr1m, 5.003) plus fixups.

p4raw-id: //depot/thrperl@4

1 files changed, 2 insertions, 0 deletions

diff --git a/hv.c b/hv.c
index d9cbe52337..a3dc6579dc 100644
--- a/hv.c
+++ b/hv.c
@@ -74,6 +74,7 @@ I32 lval;
 
     if (SvRMAGICAL(hv)) {
 	if (mg_find((SV*)hv,'P')) {
+	    dTHR;
 	    sv = sv_newmortal();
 	    mg_copy((SV*)hv, sv, key, klen);
 	    Sv = sv;
@@ -278,6 +279,7 @@ U32 klen;
 
     if (SvRMAGICAL(hv)) {
 	if (mg_find((SV*)hv,'P')) {
+	    dTHR;
 	    sv = sv_newmortal();
 	    mg_copy((SV*)hv, sv, key, klen); 
 	    magic_existspack(sv, mg_find(sv, 'p'));