Integrate with Sarathy; manual resolve on regcomp.c conflicts

(Ilya's changes won).

p4raw-id: //depot/cfgperl@4468

1 files changed, 8 insertions, 2 deletions

diff --git a/pp.c b/pp.c
index b38693bb31..02fe84a732 100644
--- a/pp.c
+++ b/pp.c
@@ -245,8 +245,14 @@ PP(pp_rv2gv)
 		    STRLEN len = 0;
 		    char *name = "";
 		    if (cUNOP->op_first->op_type == OP_PADSV) {
-			SV *padname = *av_fetch(PL_comppad_name, cUNOP->op_first->op_targ, 4);
-			name = SvPV(padname,len);                                                    
+			SV **namep = av_fetch(PL_comppad_name, cUNOP->op_first->op_targ, 4);
+			if (namep && *namep) {
+			    name = SvPV(*namep,len);
+			    if (!name) {
+				name = "";
+				len  = 0;
+			    }
+			}
 		    }
 		    gv_init(gv, PL_curcop->cop_stash, name, len, 0);
 		    sv_upgrade(sv, SVt_RV);