summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-05
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-25
-rw-r--r--ChangeLog.pre-2-45
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gtk/gtkrc.c4
8 files changed, 37 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f2a748df01..af8d9629b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 9 00:41:41 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkrc.c (gtk_rc_add_initial_default_files): Allocate
+ correct amount of memory for strings.
+
Tue Dec 8 18:29:05 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.6
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f2a748df01..af8d9629b3 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Wed Dec 9 00:41:41 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkrc.c (gtk_rc_add_initial_default_files): Allocate
+ correct amount of memory for strings.
+
Tue Dec 8 18:29:05 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.6
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f2a748df01..af8d9629b3 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Dec 9 00:41:41 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkrc.c (gtk_rc_add_initial_default_files): Allocate
+ correct amount of memory for strings.
+
Tue Dec 8 18:29:05 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.6
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f2a748df01..af8d9629b3 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed Dec 9 00:41:41 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkrc.c (gtk_rc_add_initial_default_files): Allocate
+ correct amount of memory for strings.
+
Tue Dec 8 18:29:05 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.6
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f2a748df01..af8d9629b3 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Dec 9 00:41:41 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkrc.c (gtk_rc_add_initial_default_files): Allocate
+ correct amount of memory for strings.
+
Tue Dec 8 18:29:05 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.6
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f2a748df01..af8d9629b3 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Dec 9 00:41:41 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkrc.c (gtk_rc_add_initial_default_files): Allocate
+ correct amount of memory for strings.
+
Tue Dec 8 18:29:05 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.6
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f2a748df01..af8d9629b3 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Dec 9 00:41:41 1998 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkrc.c (gtk_rc_add_initial_default_files): Allocate
+ correct amount of memory for strings.
+
Tue Dec 8 18:29:05 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.6
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index fce03fa803..91e5bd06ce 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -336,12 +336,12 @@ gtk_rc_add_initial_default_files (void)
}
else
{
- str = g_malloc (strlen(GTK_SYSCONFDIR) + strlen("/gtkrc"));
+ str = g_malloc (strlen(GTK_SYSCONFDIR) + strlen("/gtkrc") + 1);
sprintf (str, "%s%s", GTK_SYSCONFDIR, "/gtkrc");
gtk_rc_add_default_file (str);
var = g_get_home_dir ();
- str = g_malloc (strlen(var) + strlen("/.gtkrc"));
+ str = g_malloc (strlen(var) + strlen("/.gtkrc") + 1);
sprintf (str, "%s%s", var, "/.gtkrc");
gtk_rc_add_default_file (str);
}