summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2005-08-24 04:15:28 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-08-24 04:15:28 +0000
commit3b40a9c2d97c676ce956c8122ca83526ba55e04c (patch)
tree6da2f42e0b449427ac56e1a3a584f814743b5cc4
parent2b1bea02f28cdef4a98e26b97594eb9ea798a95d (diff)
downloadgtk+-3b40a9c2d97c676ce956c8122ca83526ba55e04c.tar.gz
Fix #314335
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--ChangeLog.pre-2-86
-rw-r--r--gtk/gtktreemodelfilter.c7
4 files changed, 22 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 16ccd72278..e4c52d8ef7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-24 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_visible): Protect
+ against lazy filterers which return values other than TRUE or
+ FALSE from their visible func. (#314335)
+
2005-08-23 Owen Taylor <otaylor@redhat.com>
Fix for #314004, reported by Michael Reinsch:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 16ccd72278..e4c52d8ef7 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-08-24 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_visible): Protect
+ against lazy filterers which return values other than TRUE or
+ FALSE from their visible func. (#314335)
+
2005-08-23 Owen Taylor <otaylor@redhat.com>
Fix for #314004, reported by Michael Reinsch:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 16ccd72278..e4c52d8ef7 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-08-24 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_visible): Protect
+ against lazy filterers which return values other than TRUE or
+ FALSE from their visible func. (#314335)
+
2005-08-23 Owen Taylor <otaylor@redhat.com>
Fix for #314004, reported by Michael Reinsch:
diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 85a89b77b5..13e2293996 100644
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -686,9 +686,10 @@ gtk_tree_model_filter_visible (GtkTreeModelFilter *filter,
{
if (filter->priv->visible_func)
{
- return (filter->priv->visible_func (filter->priv->child_model,
- child_iter,
- filter->priv->visible_data));
+ return filter->priv->visible_func (filter->priv->child_model,
+ child_iter,
+ filter->priv->visible_data)
+ ? TRUE : FALSE:
}
else if (filter->priv->visible_column >= 0)
{