glib r6576 - trunk/glib

[tml svn gnome org]

Author: tml
Date: Sun Feb 24 21:31:44 2008
New Revision: 6576
URL: http://svn.gnome.org/viewvc/glib?rev=6576&view=rev

Log:
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.



Modified:
   trunk/glib/gspawn-win32.c

Modified: trunk/glib/gspawn-win32.c
==============================================================================
--- trunk/glib/gspawn-win32.c	(original)
+++ trunk/glib/gspawn-win32.c	Sun Feb 24 21:31:44 2008
@@ -592,8 +592,13 @@
     helper_process = HELPER_PROCESS ".exe";
   
   glib_top = _glib_get_installation_directory ();
-  helper_process = g_build_filename (glib_top, "bin", helper_process, NULL);
-  g_free (glib_top);
+  if (glib_top != NULL)
+    {
+      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;