Allocate correct amount of memory for strings.

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.

diff --git a/ChangeLog b/ChangeLog
index f2a748df01b7aa3282d0bbcb8528e4f72008488a..af8d9629b3b8ab460df7aa46b078333fb61121e6 100644 (file)
--- 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 f2a748df01b7aa3282d0bbcb8528e4f72008488a..af8d9629b3b8ab460df7aa46b078333fb61121e6 100644 (file)
--- 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 f2a748df01b7aa3282d0bbcb8528e4f72008488a..af8d9629b3b8ab460df7aa46b078333fb61121e6 100644 (file)
--- 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 f2a748df01b7aa3282d0bbcb8528e4f72008488a..af8d9629b3b8ab460df7aa46b078333fb61121e6 100644 (file)
--- 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 f2a748df01b7aa3282d0bbcb8528e4f72008488a..af8d9629b3b8ab460df7aa46b078333fb61121e6 100644 (file)
--- 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 f2a748df01b7aa3282d0bbcb8528e4f72008488a..af8d9629b3b8ab460df7aa46b078333fb61121e6 100644 (file)
--- 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 f2a748df01b7aa3282d0bbcb8528e4f72008488a..af8d9629b3b8ab460df7aa46b078333fb61121e6 100644 (file)
--- 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 fce03fa803c4a1cf2c4da7479ccd616ac0ec8634..91e5bd06ce84ba916715d640317419bdca00a544 100644 (file)
--- 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);
     }