Fix invalid free at exit on non-UTF-8 systems

[vlc] / bin / vlc.c

diff --git a/bin/vlc.c b/bin/vlc.c
index d6fc5a820fa3f43ab0ea728f07d3e948f9de8bbc..277cecf1db56522c7a6466ca106a908a0a150154 100644 (file)
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -50,6 +50,13 @@ extern void vlc_enable_override (void);
 #include <unistd.h>
 #include <dlfcn.h>
 
+#ifdef HAVE_MAEMO
+static void dummy_handler (int signum)
+{
+    (void) signum;
+}
+#endif
+
 /*****************************************************************************
  * main: parse command line, start interface and spawn threads.
  *****************************************************************************/
@@ -61,21 +68,22 @@ int main( int i_argc, const char *ppsz_argv[] )
      * Note: this is NOT an excuse for not protecting against SIGPIPE. If
      * LibVLC runs outside of VLC, we cannot rely on this code snippet. */
     signal (SIGPIPE, SIG_IGN);
+    /* Restore default for SIGCHLD in case parent ignores it. */
+    signal (SIGCHLD, SIG_DFL);
 
-#ifdef HAVE_PUTENV
+#ifdef HAVE_SETENV
 # ifndef NDEBUG
     /* Activate malloc checking routines to detect heap corruptions. */
-    putenv( (char*)"MALLOC_CHECK_=2" );
+    setenv ("MALLOC_CHECK_", "2", 1);
 
     /* Disable the ugly Gnome crash dialog so that we properly segfault */
-    putenv( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" );
+    setenv ("GNOME_DISABLE_CRASH_DIALOG", "1", 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
-#ifdef HAVE_SETENV
+    setenv ("XLIB_SKIP_ARGB_VISUALS", "1", 1);
+
     /* Clear the X.Org startup notification ID. Otherwise the UI might try to
      * change the environment while the process is multi-threaded. That could
      * crash. Screw you X.Org. Next time write a thread-safe specification. */
@@ -132,6 +140,13 @@ int main( int i_argc, const char *ppsz_argv[] )
     sigemptyset (&set);
     for (unsigned i = 0; i < sizeof (sigs) / sizeof (sigs[0]); i++)
         sigaddset (&set, sigs[i]);
+#ifdef HAVE_MAEMO
+    sigaddset (&set, SIGRTMIN);
+    {
+        struct sigaction act = { .sa_handler = dummy_handler, };
+        sigaction (SIGRTMIN, &act, NULL);
+    }
+#endif
 
     /* Block all these signals */
     pthread_sigmask (SIG_BLOCK, &set, NULL);
@@ -139,10 +154,11 @@ int main( int i_argc, const char *ppsz_argv[] )
     sigdelset (&set, SIGCHLD);
 
     /* Note that FromLocale() can be used before libvlc is initialized */
-    const char *argv[i_argc + 3];
+    const char *argv[i_argc + 4];
     int argc = 0;
 
     argv[argc++] = "--no-ignore-config";
+    argv[argc++] = "--user-agent=\"VLC media player\"";
 #ifdef TOP_BUILDDIR
     argv[argc++] = FromLocale ("--plugin-path="TOP_BUILDDIR"/modules");
 #endif
@@ -184,7 +200,7 @@ int main( int i_argc, const char *ppsz_argv[] )
         libvlc_release (vlc);
     }
 
-    for (int i = 1; i < argc; i++)
+    for (int i = 2; i < argc; i++)
         LocaleFree (argv[i]);
 
 #ifdef RTLD_NOLOAD