Change 27343 by [EMAIL PROTECTED] on 2006/02/27 15:36:46
Subject: [PATCH] PERL_TRACK_MEMPOOL cripples environment after exit()
From: Marcus Holland-Moritz <[EMAIL PROTECTED]>
Date: Sun, 26 Feb 2006 20:47:21 +0100
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/perl/miniperlmain.c#51 edit
Differences ...
==== //depot/perl/miniperlmain.c#51 (text) ====
Index: perl/miniperlmain.c
--- perl/miniperlmain.c#50~27300~ 2006-02-24 02:41:53.000000000 -0800
+++ perl/miniperlmain.c 2006-02-27 07:36:46.000000000 -0800
@@ -101,11 +101,24 @@
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 */
End of Patch.
