callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't crash if mime_type is NULL. (#322998, Sadrul Habib Chowdhury)

Browse Source 
2005-12-02  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilesystemunix.c (get_icon_for_mime_type): Don't crash
	if mime_type is NULL.  (#322998, Sadrul Habib Chowdhury)
This commit is contained in:
Matthias Clasen
2005-12-02 19:57:36 +00:00
committed by Matthias Clasen
parent b3f1be3b56
commit 0b1fa236fd
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-12-02 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilesystemunix.c (get_icon_for_mime_type): Don't crash
if mime_type is NULL. (#322998, Sadrul Habib Chowdhury)
2005-12-02 Michael Natterer <mitch@imendio.com> 2005-12-02 Michael Natterer <mitch@imendio.com>
* gtk/gtkmenu.c: applied modified patch from maemo-gtk which * gtk/gtkmenu.c: applied modified patch from maemo-gtk which

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2005-12-02 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilesystemunix.c (get_icon_for_mime_type): Don't crash
if mime_type is NULL. (#322998, Sadrul Habib Chowdhury)
2005-12-02 Michael Natterer <mitch@imendio.com> 2005-12-02 Michael Natterer <mitch@imendio.com>
* gtk/gtkmenu.c: applied modified patch from maemo-gtk which * gtk/gtkmenu.c: applied modified patch from maemo-gtk which

3
gtk/gtkfilesystemunix.c
View File

@ -1284,6 +1284,9 @@ get_icon_for_mime_type (GtkWidget *widget,
GString *icon_name; GString *icon_name;
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
if (!mime_type)
return NULL;
separator = strchr (mime_type, '/'); separator = strchr (mime_type, '/');
if (!separator) if (!separator)
return NULL; /* maybe we should return a GError with "invalid MIME-type" */ return NULL; /* maybe we should return a GError with "invalid MIME-type" */