Don't access invalid memory address if p wasn't increased. (#159557,

2004-11-26  Matthias Clasen  <mclasen@redhat.com>

	* glib/gkeyfile.c (g_key_file_parse_value_as_string):
	Don't access invalid memory address if p wasn't
	increased.  (#159557, Frederic Crozat)

diff --git a/ChangeLog b/ChangeLog
index 81aea56e7d4da81abad6c8d8fccaa98daf8ec3a1..6aa72145286dc503592b2af9391ff9486bfdafb0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gkeyfile.c (g_key_file_parse_value_as_string): 
+       Don't access invalid memory address if p wasn't 
+       increased.  (#159557, Frederic Crozat)
+
 2004-11-25  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/strtod-test.c (main): Add a testcase for the previous fix.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 81aea56e7d4da81abad6c8d8fccaa98daf8ec3a1..6aa72145286dc503592b2af9391ff9486bfdafb0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-11-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gkeyfile.c (g_key_file_parse_value_as_string): 
+       Don't access invalid memory address if p wasn't 
+       increased.  (#159557, Frederic Crozat)
+
 2004-11-25  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/strtod-test.c (main): Add a testcase for the previous fix.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 81aea56e7d4da81abad6c8d8fccaa98daf8ec3a1..6aa72145286dc503592b2af9391ff9486bfdafb0 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2004-11-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gkeyfile.c (g_key_file_parse_value_as_string): 
+       Don't access invalid memory address if p wasn't 
+       increased.  (#159557, Frederic Crozat)
+
 2004-11-25  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/strtod-test.c (main): Add a testcase for the previous fix.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 81aea56e7d4da81abad6c8d8fccaa98daf8ec3a1..6aa72145286dc503592b2af9391ff9486bfdafb0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-11-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gkeyfile.c (g_key_file_parse_value_as_string): 
+       Don't access invalid memory address if p wasn't 
+       increased.  (#159557, Frederic Crozat)
+
 2004-11-25  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/strtod-test.c (main): Add a testcase for the previous fix.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 81aea56e7d4da81abad6c8d8fccaa98daf8ec3a1..6aa72145286dc503592b2af9391ff9486bfdafb0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-11-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gkeyfile.c (g_key_file_parse_value_as_string): 
+       Don't access invalid memory address if p wasn't 
+       increased.  (#159557, Frederic Crozat)
+
 2004-11-25  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/strtod-test.c (main): Add a testcase for the previous fix.

diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index 939589e5ef213a84350826bdc4fb57906589ab57..7d62407d748b2880b612421fd93165dac4bb4697 100644 (file)
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -3041,7 +3041,7 @@ g_key_file_parse_value_as_string (GKeyFile     *key_file,
       p++;
     }
 
-  if (p[-1] == '\\' && error == NULL)
+  if (p > value && p[-1] == '\\' && error == NULL)
     g_set_error (error, G_KEY_FILE_ERROR,
                 G_KEY_FILE_ERROR_INVALID_VALUE,
                 _("Key file contains escape character at end of line"));