From 40b4e103b4bd5d518bbd35b25638cd40100c9b15 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 27 Nov 2004 02:59:09 +0000 Subject: [PATCH] Don't access invalid memory address if p wasn't increased. (#159557, 2004-11-26 Matthias Clasen * glib/gkeyfile.c (g_key_file_parse_value_as_string): Don't access invalid memory address if p wasn't increased. (#159557, Frederic Crozat) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib/gkeyfile.c | 2 +- 6 files changed, 31 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 81aea56e..6aa72145 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-11-26 Matthias Clasen + + * 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 * 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 81aea56e..6aa72145 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-11-26 Matthias Clasen + + * 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 * 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 81aea56e..6aa72145 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2004-11-26 Matthias Clasen + + * 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 * 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 81aea56e..6aa72145 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-11-26 Matthias Clasen + + * 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 * 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 81aea56e..6aa72145 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-11-26 Matthias Clasen + + * 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 * tests/strtod-test.c (main): Add a testcase for the previous fix. diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c index 939589e5..7d62407d 100644 --- 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")); -- 2.34.1