mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3021_segfault_unowned_temp_dir' 

* 3021_segfault_unowned_temp_dir:
  Ticket #3021: mc segfaults when mc's tempdir doesn't belong to the correct user.
This commit is contained in:
Andrew Borodin 2013-07-06 14:57:21 +04:00
parent 1db4f7bb52 e7fd5bcaa4
commit 86fc45dd40
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.c
View File

@ -153,9 +153,6 @@ OS_Setup (void)
mc_global.sysconfig_dir = g_strdup (SYSCONFDIR); mc_global.sysconfig_dir = g_strdup (SYSCONFDIR);
mc_global.share_data_dir = g_strdup (DATADIR); mc_global.share_data_dir = g_strdup (DATADIR);
/* Set up temporary directory */
mc_tmpdir ();
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -298,6 +295,9 @@ main (int argc, char *argv[])
vfs_plugins_init (); vfs_plugins_init ();
vfs_setup_work_dir (); vfs_setup_work_dir ();
/* Set up temporary directory after VFS initialization */
mc_tmpdir ();
/* do this after vfs initialization due to mc_setctl() call in mc_setup_by_args() */ /* do this after vfs initialization due to mc_setctl() call in mc_setup_by_args() */
if (!mc_setup_by_args (argc, argv, &error)) if (!mc_setup_by_args (argc, argv, &error))
{ {