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

app: fix file_check_magic_list() to handle "and" matches again

Browse Source 
where the magic is only supposed to match if all magics in the "and"
list match.
This commit is contained in:
Michael Natterer
2016-04-25 01:04:07 +02:00
parent f3502d72b3
commit eca44cc87d
1 changed files with 53 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/plug-in/gimppluginmanager-file-procedure.c
View File

@ -658,6 +658,8 @@ file_check_magic_list (GSList *magics_list,
else else
found = (single_match_val != FILE_MATCH_NONE); found = (single_match_val != FILE_MATCH_NONE);
if (found)
{
if (match_val == FILE_MATCH_NONE) if (match_val == FILE_MATCH_NONE)
{ {
/* if we have no match yet, this is it in any case */ /* if we have no match yet, this is it in any case */
@ -692,6 +694,17 @@ file_check_magic_list (GSList *magics_list,
match_val = single_match_val + 1; match_val = single_match_val + 1;
} }
} }
}
else
{
match_val = FILE_MATCH_NONE;
}
and = (strchr (offset, '&') != NULL);
if (! and)
{
/* when done with this 'and' list, update best_match_val */
if (best_match_val == FILE_MATCH_NONE) if (best_match_val == FILE_MATCH_NONE)
{ {
@ -709,11 +722,9 @@ file_check_magic_list (GSList *magics_list,
best_match_val = MAX (best_match_val, match_val); best_match_val = MAX (best_match_val, match_val);
} }
and = (strchr (offset, '&') != NULL);
if (! and)
match_val = FILE_MATCH_NONE; match_val = FILE_MATCH_NONE;
} }
}
return best_match_val; return best_match_val;
} }