summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--gconf/gconf-internals.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 61c6db5c..2704636b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2000-01-24 Havoc Pennington <hp@redhat.com>
+ * gconf/gconf-internals.c (gconf_get_lock): Use a long enough
+ buffer to read in the IOR
+
+2000-01-24 Havoc Pennington <hp@redhat.com>
+
* gconf/gconftool.c (do_load_schema_file): Apply patch from Mirko,
properly locates the root node instead of assuming it is the only
node at the toplevel (handles comments, etc).
diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c
index df6032e5..4ad68b2f 100644
--- a/gconf/gconf-internals.c
+++ b/gconf/gconf-internals.c
@@ -2230,9 +2230,9 @@ gconf_get_lock(const gchar* lock_directory,
}
else
{
- gchar buf[256] = { '\0' };
+ gchar buf[2048] = { '\0' };
gchar* str = NULL;
- fgets(buf, 255, fp);
+ fgets(buf, 2047, fp);
fclose(fp);
/* The lockfile format is <pid>:<ior> for gconfd