Integrate with Nick.

p4raw-id: //depot/cfgperl@3999

1 files changed, 5 insertions, 1 deletions

diff --git a/util.c b/util.c
index 2c349e25b0..36c9186b94 100644
--- a/util.c
+++ b/util.c
@@ -1491,7 +1491,11 @@ Perl_vdie(pTHX_ const char* pat, va_list *args)
 	    PUSHMARK(SP);
 	    XPUSHs(msg);
 	    PUTBACK;
-	    call_sv((SV*)cv, G_DISCARD);
+	    /* HACK - REVISIT - avoid CATCH_SET(TRUE) in call_sv()
+	       or we come back here due to a JMPENV_JMP() and do 
+	       a POPSTACK - but die_where() will have already done 
+	       one as it unwound - NI-S 1999/08/14 */
+	    call_sv((SV*)cv, G_DISCARD|G_NOCATCH);
 	    POPSTACK;
 	    LEAVE;
 	}