From 823bd8b103ffefdd465a10eb1ce7a5351880b04e Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sun, 17 Jul 2005 16:40:12 +0000 Subject: Make sure the option is in the right option group. 2005-07-17 Christian Persch * src/bookmarks/ephy-bookmarks.c: (get_option): Make sure the option is in the right option group. --- ChangeLog | 6 ++++++ src/bookmarks/ephy-bookmarks.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b5c312df1..121b50937 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-07-17 Christian Persch + + * src/bookmarks/ephy-bookmarks.c: (get_option): + + Make sure the option is in the right option group. + 2005-07-17 Christian Persch * src/bookmarks/ephy-bookmarks.c: (get_option), diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index e934cad9f..7f50f48a6 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -1298,7 +1298,7 @@ get_option (char *start, *optionsend = end + 1; start = strstr (start, name); - if (start == NULL) return NULL; + if (start == NULL || start > end) return NULL; start += strlen (name); /* Find end of option, either ',' or '}' */ -- cgit v1.2.3