AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid possible memory corruption in xdgmime, fd.o bug 12512, reported by

Browse Source 
2008-04-16  Matthias Clasen  <mclasen@redhat.com>

        Avoid possible memory corruption in xdgmime, fd.o bug 12512,
        reported by Joe Shaw and Federico Mena Quintero.

        * xdgmime.c(_xdg_mime_media_type_equal): Implement.
        (xdg_mime_media_type_equal): Turn into a wrapper around the
        _-prefixed version.

        * xdgmimecache.c: Use the _-prefixed versions of
        comparison functions throughout.


svn path=/trunk/; revision=20009
This commit is contained in:
Matthias Clasen 2008-04-16 16:59:28 +00:00 committed by Matthias Clasen
parent b1542fe913
commit f3177151c6
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/xdgmime/ChangeLog
View File

@ -1,3 +1,15 @@
2008-04-16 Matthias Clasen <mclasen@redhat.com>
Avoid possible memory corruption in xdgmime, fd.o bug 12512,
reported by Joe Shaw and Federico Mena Quintero.
* xdgmime.c(_xdg_mime_media_type_equal): Implement.
(xdg_mime_media_type_equal): Turn into a wrapper around the
_-prefixed version.
* xdgmimecache.c: Use the _-prefixed versions of
comparison functions throughout.
2008-02-16 Matthias Clasen <mclasen@redhat.com>
* === Released 2.13.0 ===

15
gtk/xdgmime/xdgmime.c
View File

@ -670,13 +670,11 @@ xdg_mime_mime_type_equal (const char *mime_a,
}
int
xdg_mime_media_type_equal (const char *mime_a,
const char *mime_b)
_xdg_mime_media_type_equal (const char *mime_a,
const char *mime_b)
{
char *sep;
xdg_mime_init ();
sep = strchr (mime_a, '/');
if (sep && strncmp (mime_a, mime_b, sep - mime_a + 1) == 0)
@ -685,6 +683,15 @@ xdg_mime_media_type_equal (const char *mime_a,
return 0;
}
int
xdg_mime_media_type_equal (const char *mime_a,
const char *mime_b)
{
xdg_mime_init ();
return _xdg_mime_media_type_equal (mime_a, mime_b);
}
#if 1
static int
xdg_mime_is_super_type (const char *mime)

4
gtk/xdgmime/xdgmimecache.c
View File

@ -297,7 +297,7 @@ cache_magic_lookup_data (XdgMimeCache *cache,
for (n = 0; n < n_mime_types; n++)
{
if (mime_types[n] &&
xdg_mime_mime_type_equal (mime_types[n], non_match))
_xdg_mime_mime_type_equal (mime_types[n], non_match))
mime_types[n] = NULL;
}
}
@ -783,7 +783,7 @@ _xdg_mime_cache_mime_type_subclass (const char *mime,
#if 1
/* Handle supertypes */
if (is_super_type (ubase) &&
xdg_mime_media_type_equal (umime, ubase))
_xdg_mime_media_type_equal (umime, ubase))
return 1;
#endif