diff options
| author | Marcus Holland-Moritz <mhx-perl@gmx.net> | 2006-02-26 21:47:21 +0100 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2006-02-27 15:36:46 +0000 |
| commit | 22f43f2c71561997b91864c37ea97e2d3ad7e327 (patch) | |
| tree | fc40c3825e8d6ab6a778ad4d98925bd638e804b7 /miniperlmain.c | |
| parent | bef1d2845fb0db7845d14820c48acfde8ab087fe (diff) | |
| download | perl-22f43f2c71561997b91864c37ea97e2d3ad7e327.tar.gz | |
PERL_TRACK_MEMPOOL cripples environment after exit()
Message-ID: <20060226204721.00be2bff@r2d2>
p4raw-id: //depot/perl@27343
Diffstat (limited to 'miniperlmain.c')
| -rw-r--r-- | miniperlmain.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/miniperlmain.c b/miniperlmain.c index 140711bf7d..601008719f 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 */ |