aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/bookmarks/ephy-bookmarks.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b5c312df1..121b50937 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-07-17 Christian Persch <chpe@cvs.gnome.org>
+ * src/bookmarks/ephy-bookmarks.c: (get_option):
+
+ Make sure the option is in the right option group.
+
+2005-07-17 Christian Persch <chpe@cvs.gnome.org>
+
* src/bookmarks/ephy-bookmarks.c: (get_option),
(ephy_bookmarks_get_smart_bookmark_width):
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 '}' */