From 5e70dc219520c5fda22dc4db0e362ff76762cef0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 4 Nov 2005 15:58:25 +0000 Subject: [PATCH] Prevent a segfault. 2005-11-04 Matthias Clasen * xdgmime.c (xdg_mime_list_mime_parents): Prevent a segfault. --- gtk/xdgmime/ChangeLog | 5 +++++ gtk/xdgmime/xdgmime.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/gtk/xdgmime/ChangeLog b/gtk/xdgmime/ChangeLog index d201ddba8b..b4f9f08055 100644 --- a/gtk/xdgmime/ChangeLog +++ b/gtk/xdgmime/ChangeLog @@ -1,3 +1,8 @@ +2005-11-04 Matthias Clasen + + * xdgmime.c (xdg_mime_list_mime_parents): Prevent + a segfault. + 2005-10-18 Matthias Clasen * xdgmimecache.c: Make magic comparisons work correctly diff --git a/gtk/xdgmime/xdgmime.c b/gtk/xdgmime/xdgmime.c index c7ac59290a..4adf699c5c 100644 --- a/gtk/xdgmime/xdgmime.c +++ b/gtk/xdgmime/xdgmime.c @@ -713,6 +713,10 @@ xdg_mime_list_mime_parents (const char *mime) return _xdg_mime_cache_list_mime_parents (mime); parents = xdg_mime_get_mime_parents (mime); + + if (!parents) + return NULL; + for (i = 0; parents[i]; i++) ; n = (i + 1) * sizeof (char *);