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

Fix several problems with this function. (fd.o #9560, Yevgen Muntyan)

Browse Source 
2007-01-07  Matthias Clasen  <mclasen@redhat.com>

        * xdgmimecache.c (_xdg_mime_cache_list_mime_parents): Fix
        several problems with this function.  (fd.o #9560, Yevgen Muntyan)



svn path=/trunk/; revision=17110
This commit is contained in:
Matthias Clasen 2007-01-08 03:39:41 +00:00 committed by Matthias Clasen
parent 9008d48524
commit 76565d32fa
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/xdgmime/ChangeLog
View File

@ -1,3 +1,8 @@
2007-01-07 Matthias Clasen <mclasen@redhat.com>
* xdgmimecache.c (_xdg_mime_cache_list_mime_parents): Fix
several problems with this function. (fd.o #9560, Yevgen Muntyan)
2006-08-17 Matthias Clasen <mclasen@redhat.com> 2006-08-17 Matthias Clasen <mclasen@redhat.com>
* === Released 2.10.2 === * === Released 2.10.2 ===

16
gtk/xdgmime/xdgmimecache.c
View File

@ -850,10 +850,12 @@ _xdg_mime_cache_unalias_mime_type (const char *mime)
char ** char **
_xdg_mime_cache_list_mime_parents (const char *mime) _xdg_mime_cache_list_mime_parents (const char *mime)
{ {
int i, j, p; int i, j, k, p;
char *all_parents[128]; /* we'll stop at 128 */ char *all_parents[128]; /* we'll stop at 128 */
char **result; char **result;
mime = xdg_mime_unalias_mime_type (mime);
p = 0; p = 0;
for (i = 0; _caches[i]; i++) for (i = 0; _caches[i]; i++)
{ {
@ -864,15 +866,19 @@ _xdg_mime_cache_list_mime_parents (const char *mime)
for (j = 0; j < n_entries; j++) for (j = 0; j < n_entries; j++)
{ {
xdg_uint32_t mimetype_offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * i); xdg_uint32_t mimetype_offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * j);
xdg_uint32_t parents_offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * i + 4); xdg_uint32_t parents_offset = GET_UINT32 (cache->buffer, list_offset + 4 + 8 * j + 4);
if (strcmp (cache->buffer + mimetype_offset, mime) == 0) if (strcmp (cache->buffer + mimetype_offset, mime) == 0)
{ {
xdg_uint32_t parent_mime_offset;
xdg_uint32_t n_parents = GET_UINT32 (cache->buffer, parents_offset); xdg_uint32_t n_parents = GET_UINT32 (cache->buffer, parents_offset);
for (j = 0; j < n_parents; j++) for (k = 0; k < n_parents && p < 127; k++)
all_parents[p++] = cache->buffer + parents_offset + 4 + 4 * j; {
parent_mime_offset = GET_UINT32 (cache->buffer, parents_offset + 4 + 4 * k);
all_parents[p++] = cache->buffer + parent_mime_offset;
}
break; break;
} }