aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-10-30 21:52:58 +0800
committerChristian Persch <chpe@src.gnome.org>2005-10-30 21:52:58 +0800
commit1fb397be102cdfe6fa12fb363e689ce68595cad0 (patch)
tree4aea3e19eec25147bef403e2c1397052f14b6133
parentba4c78ce66c51332b9cdf4bdc7e9c9bf363c7cfc (diff)
downloadgsoc2013-epiphany-1fb397be102cdfe6fa12fb363e689ce68595cad0.tar
gsoc2013-epiphany-1fb397be102cdfe6fa12fb363e689ce68595cad0.tar.gz
gsoc2013-epiphany-1fb397be102cdfe6fa12fb363e689ce68595cad0.tar.bz2
gsoc2013-epiphany-1fb397be102cdfe6fa12fb363e689ce68595cad0.tar.lz
gsoc2013-epiphany-1fb397be102cdfe6fa12fb363e689ce68595cad0.tar.xz
gsoc2013-epiphany-1fb397be102cdfe6fa12fb363e689ce68595cad0.tar.zst
gsoc2013-epiphany-1fb397be102cdfe6fa12fb363e689ce68595cad0.zip
Add array bounds check; fixes bug #320169.
2005-10-30 Christian Persch <chpe@cvs.gnome.org> * src/bookmarks/ephy-nodes-cover.c: (ephy_nodes_get_covering): Add array bounds check; fixes bug #320169.
-rw-r--r--ChangeLog6
-rw-r--r--src/bookmarks/ephy-nodes-cover.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d427d802..2273521da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-10-30 Christian Persch <chpe@cvs.gnome.org>
+ * src/bookmarks/ephy-nodes-cover.c: (ephy_nodes_get_covering):
+
+ Add array bounds check; fixes bug #320169.
+
+2005-10-30 Christian Persch <chpe@cvs.gnome.org>
+
* lib/egg/egg-editable-toolbar.c: (create_item_from_action):
Set the action's accel group. Fixes bug #319536.
diff --git a/src/bookmarks/ephy-nodes-cover.c b/src/bookmarks/ephy-nodes-cover.c
index dfe461ee3..92b2800f3 100644
--- a/src/bookmarks/ephy-nodes-cover.c
+++ b/src/bookmarks/ephy-nodes-cover.c
@@ -162,7 +162,7 @@ ephy_nodes_get_covering (const GPtrArray *parents, const GPtrArray *children,
}
/* While there are more suitable topics... */
- while (count_u[p])
+ while (p < parents->len && count_u[p])
{
/* Update the arrays of uncovered bookmarks and covering topics. */
parent = g_ptr_array_index (parents, p);