From da6dfbd50f8ae66d57dec644e2b8034896da054b Mon Sep 17 00:00:00 2001
From: Dave Neary <bolsh@gimp.org>
Date: Tue, 16 Sep 2003 19:41:44 +0000
Subject: [PATCH] Fixed a seg fault in an earlier commit.

2003-09-16  Dave Neary  <bolsh@gimp.org>

        * app/config/gimpconfig-path.c: Fixed a seg fault in an earlier
        commit.
---
 ChangeLog                       |  5 +++++
 app/config/gimpconfig-path.c    | 10 +++++++++-
 libgimpconfig/gimpconfig-path.c | 10 +++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d79910f8e1..8f41f33116 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-16  Dave Neary  <bolsh@gimp.org>
+
+	* app/config/gimpconfig-path.c: Fixed a seg fault in an earlier
+	commit.
+
 2003-09-16  Michael Natterer  <mitch@gimp.org>
 
 	* app/gui/brushes-menu.c
diff --git a/app/config/gimpconfig-path.c b/app/config/gimpconfig-path.c
index ddef084e3f..97cfe9983c 100644
--- a/app/config/gimpconfig-path.c
+++ b/app/config/gimpconfig-path.c
@@ -151,7 +151,15 @@ gimp_config_path_expand (const gchar  *path,
 
   expanded = g_new (gchar, length + 1);
 
-  p = filename;
+  if (filename)
+    {
+      p = filename;
+    }
+  else
+    {
+      p = path;
+    }
+
   n = expanded;
 
   while (*p)
diff --git a/libgimpconfig/gimpconfig-path.c b/libgimpconfig/gimpconfig-path.c
index ddef084e3f..97cfe9983c 100644
--- a/libgimpconfig/gimpconfig-path.c
+++ b/libgimpconfig/gimpconfig-path.c
@@ -151,7 +151,15 @@ gimp_config_path_expand (const gchar  *path,
 
   expanded = g_new (gchar, length + 1);
 
-  p = filename;
+  if (filename)
+    {
+      p = filename;
+    }
+  else
+    {
+      p = path;
+    }
+
   n = expanded;
 
   while (*p)