[vlc-commits] commit: Set debug environment variable earlier ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Apr 11 12:09:49 2010 +0300| [8378cde8c45fe15f501b12ad782f99ff73d0247a] | committer: Rémi Denis-Courmont 

Set debug environment variable earlier

Ensure that stdio and libintl won't do heap allocations beforehand.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8378cde8c45fe15f501b12ad782f99ff73d0247a
---

 bin/vlc.c |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bin/vlc.c b/bin/vlc.c
index 5d6fec3..e486040 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -61,6 +61,20 @@ int main( int i_argc, const char *ppsz_argv[] )
      * LibVLC runs outside of VLC, we cannot rely on this code snippet. */
     signal (SIGPIPE, SIG_IGN);
 
+#ifdef HAVE_PUTENV
+# ifndef NDEBUG
+    /* Activate malloc checking routines to detect heap corruptions. */
+    putenv( (char*)"MALLOC_CHECK_=2" );
+
+    /* Disable the ugly Gnome crash dialog so that we properly segfault */
+    putenv( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" );
+# endif
+
+    /* Make Xlib hide visuals with an alphachannel. Ensure that Qt4 will not
+     * use the alpha channel for the embedded video window. */
+    putenv( (char *)"XLIB_SKIP_ARGB_VISUALS=1" );
+#endif
+
 #ifndef ALLOW_RUN_AS_ROOT
     if (geteuid () == 0)
     {
@@ -80,20 +94,6 @@ int main( int i_argc, const char *ppsz_argv[] )
              libvlc_get_version(), libvlc_get_changeset() );
 #endif
 
-#ifdef HAVE_PUTENV
-#   ifndef NDEBUG
-    /* Activate malloc checking routines to detect heap corruptions. */
-    putenv( (char*)"MALLOC_CHECK_=2" );
-
-    /* Disable the ugly Gnome crash dialog so that we properly segfault */
-    putenv( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" );
-#   endif
-#endif
-
-    /* Make Xlib hide visuals with an alphachannel. Ensure that Qt4 will not
-     * use the alpha channel for the embedded video window. */
-    putenv( (char *)"XLIB_SKIP_ARGB_VISUALS=1" );
-
     /* Synchronously intercepted POSIX signals.
      *
      * In a threaded program such as VLC, the only sane way to handle signals