Integrate change #12752 from maintperl;
authorJarkko Hietaniemi <jhi@iki.fi>
Mon, 29 Oct 2001 12:31:34 +0000 (12:31 +0000)
committerJarkko Hietaniemi <jhi@iki.fi>
Mon, 29 Oct 2001 12:31:34 +0000 (12:31 +0000)
croak(Nullch) wasn't printing the contents of ERRSV if there was
no outer eval (bug in change#6125)

p4raw-link: @12752 on //depot/maint-5.6/perl: f106aadabce363af9302c25bec7308d85ddd04a2
p4raw-link: @6125 on //depot/perl: 9983fa3c886b6f0a857997142e62341929a9b601

p4raw-id: //depot/perl@12754
p4raw-integrated: from //depot/maint-5.6/perl@12753 'merge in' util.c
(@12668..)

util.c

diff --git a/util.c b/util.c
index 75f48ef..c5b32e3 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1227,6 +1227,9 @@ Perl_vcroak(pTHX_ const char* pat, va_list *args)
        PL_restartop = die_where(message, msglen);
        JMPENV_JUMP(3);
     }
+    else if (!message)
+       message = SvPVx(ERRSV, msglen);
+
     {
 #ifdef USE_SFIO
        /* SFIO can really mess with your errno */