From: Marcus Holland-Moritz Date: Sun, 26 Feb 2006 20:47:21 +0000 (+0100) Subject: PERL_TRACK_MEMPOOL cripples environment after exit() X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=22f43f2c71561997b91864c37ea97e2d3ad7e327;p=p5sagit%2Fp5-mst-13.2.git PERL_TRACK_MEMPOOL cripples environment after exit() Message-ID: <20060226204721.00be2bff@r2d2> p4raw-id: //depot/perl@27343 --- diff --git a/miniperlmain.c b/miniperlmain.c index 140711b..6010087 100644 --- a/miniperlmain.c +++ b/miniperlmain.c @@ -101,11 +101,24 @@ main(int argc, char **argv, char **env) exitstatus = perl_parse(my_perl, xs_init, argc, argv, (char **)NULL); if (!exitstatus) perl_run(my_perl); - + exitstatus = perl_destruct(my_perl); perl_free(my_perl); +#if defined(USE_ENVIRON_ARRAY) && defined(PERL_TRACK_MEMPOOL) + /* + * The old environment may have been freed by perl_free() + * when PERL_TRACK_MEMPOOL is defined, but without having + * been restored by perl_destruct() before (this is only + * done if destruct_level > 0). + * + * It is important to have a valid environment for atexit() + * routines that are eventually called. + */ + environ = env; +#endif + #ifdef PERL_GLOBAL_STRUCT free_global_struct(plvarsp); #endif /* PERL_GLOBAL_STRUCT */