Guard against _glib_get_installation_directory() returning NULL. In that

2008-02-24  Tor Lillqvist  <tml@novell.com>

	* glib/gspawn-win32.c: Guard against
	_glib_get_installation_directory() returning NULL. In that
	case, just use the name of the helper process executable
	without path.


svn path=/trunk/; revision=6576
This commit is contained in:
Tor Lillqvist 2008-02-24 21:31:44 +00:00 committed by Tor Lillqvist
parent 17640e78d3
commit 96c7abe76a

View File

@ -592,8 +592,13 @@ do_spawn_with_pipes (gint *exit_status,
helper_process = HELPER_PROCESS ".exe"; helper_process = HELPER_PROCESS ".exe";
glib_top = _glib_get_installation_directory (); glib_top = _glib_get_installation_directory ();
if (glib_top != NULL)
{
helper_process = g_build_filename (glib_top, "bin", helper_process, NULL); helper_process = g_build_filename (glib_top, "bin", helper_process, NULL);
g_free (glib_top); g_free (glib_top);
}
else
helper_process = g_strdup (helper_process);
new_argv[0] = helper_process; new_argv[0] = helper_process;