Commit 96c7abe7 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

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
parent 17640e78
...@@ -592,8 +592,13 @@ do_spawn_with_pipes (gint *exit_status, ...@@ -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 ();
helper_process = g_build_filename (glib_top, "bin", helper_process, NULL); if (glib_top != NULL)
g_free (glib_top); {
helper_process = g_build_filename (glib_top, "bin", helper_process, NULL);
g_free (glib_top);
}
else
helper_process = g_strdup (helper_process);
new_argv[0] = helper_process; new_argv[0] = helper_process;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment