diff --git a/ChangeLog b/ChangeLog
index af1edf502..24f4bad1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gkeyfile.c (g_key_file_set_string_list)
+	(g_key_file_set_locale_string_list): Fix invalid memory
+	reads.  (#340816, Nick Treleaven)
+
 2006-05-04  Alexander Larsson  <alexl@redhat.com>
 
 	* glib/gbase64.c: (g_base64_decode_step):
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index af1edf502..24f4bad1d 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2006-05-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gkeyfile.c (g_key_file_set_string_list)
+	(g_key_file_set_locale_string_list): Fix invalid memory
+	reads.  (#340816, Nick Treleaven)
+
 2006-05-04  Alexander Larsson  <alexl@redhat.com>
 
 	* glib/gbase64.c: (g_base64_decode_step):
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index f6f295e31..4c60b95d5 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -1464,7 +1464,7 @@ g_key_file_set_string_list (GKeyFile            *key_file,
   g_return_if_fail (list != NULL);
 
   value_list = g_string_sized_new (length * 128);
-  for (i = 0; list[i] != NULL && i < length; i++)
+  for (i = 0; i < length && list[i] != NULL; i++)
     {
       gchar *value;
 
@@ -1712,7 +1712,7 @@ g_key_file_set_locale_string_list (GKeyFile            *key_file,
   g_return_if_fail (length != 0);
 
   value_list = g_string_sized_new (length * 128);
-  for (i = 0; list[i] != NULL && i < length; i++)
+  for (i = 0; i < length && list[i] != NULL; i++)
     {
       gchar *value;