From e72cea090d55cdba4c211698f4ab7bc18cf7fc7f Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 27 Dec 2005 18:38:52 +0000 Subject: [PATCH] In the case for FILTER_RULE_PIXBUF_FORMATS, check that 2005-12-27 Federico Mena Quintero * gtk/gtkfilefilter.c (gtk_file_filter_filter): In the case for FILTER_RULE_PIXBUF_FORMATS, check that filter_info->mime_type is not NULL. Fixes bug #317687. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ docs/reference/gtk/gtk-docs.sgml | 1 + gtk/gtkfilefilter.c | 3 +++ 4 files changed, 16 insertions(+) diff --git a/ChangeLog b/ChangeLog index e68f8b8ba..25f854c23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-12-27 Federico Mena Quintero + + * gtk/gtkfilefilter.c (gtk_file_filter_filter): In the case for + FILTER_RULE_PIXBUF_FORMATS, check that filter_info->mime_type is + not NULL. Fixes bug #317687. + 2005-12-27 Matthias Clasen * gdk/x11/gdkevents-x11.c (check_transform): Fix a typo. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e68f8b8ba..25f854c23 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-12-27 Federico Mena Quintero + + * gtk/gtkfilefilter.c (gtk_file_filter_filter): In the case for + FILTER_RULE_PIXBUF_FORMATS, check that filter_info->mime_type is + not NULL. Fixes bug #317687. + 2005-12-27 Matthias Clasen * gdk/x11/gdkevents-x11.c (check_transform): Fix a typo. diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index 78f09b274..4d9d862de 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -190,6 +190,7 @@ + diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c index 80d1ffb74..b5b285e2e 100644 --- a/gtk/gtkfilefilter.c +++ b/gtk/gtkfilefilter.c @@ -426,6 +426,9 @@ gtk_file_filter_filter (GtkFileFilter *filter, { GSList *list; + if (!filter_info->mime_type) + break; + for (list = rule->u.pixbuf_formats; list; list = list->next) { int i; -- 2.43.2