summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2002-10-18 06:26:29 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-10-18 06:26:29 +0000
commitae3cc100c41e80459efea2143245d20ce45e4817 (patch)
tree3cbecf06c5e99c8b710ac7cdc1195bdba83871b5
parentb76650f1ee43173e318131b3179bff03e4b9ec8a (diff)
downloadgconf-ae3cc100c41e80459efea2143245d20ce45e4817.tar.gz
patch from Benn Vosseteig fixing a crash with a long path to $HOME
2002-10-18 Havoc Pennington <hp@pobox.com> * gconf/gconf-internals.c (subst_variables): patch from Benn Vosseteig fixing a crash with a long path to $HOME
-rw-r--r--ChangeLog5
-rw-r--r--gconf/gconf-internals.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 47a1c7fb..de815630 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-18 Havoc Pennington <hp@pobox.com>
+
+ * gconf/gconf-internals.c (subst_variables): patch from
+ Benn Vosseteig fixing a crash with a long path to $HOME
+
2002-09-09 jacob berkman <jacob@ximian.com>
* gconf/GConf.idl:
diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c
index 67a801d7..de90dcb1 100644
--- a/gconf/gconf-internals.c
+++ b/gconf/gconf-internals.c
@@ -798,7 +798,7 @@ subst_variables(const gchar* src)
if ((retval_len - pos) < varval_len)
{
- retval_len *= 2;
+ retval_len *= pos + varval_len;
retval = g_realloc(retval, retval_len+3);
}