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)
    {