2008-02-11 Alexander Larsson <alexl@redhat.com>
* gfileinfo.c:
(g_file_info_set_attribute_mask):
(g_file_attribute_matcher_matches_id):
Correctly handle NULL GAttributeMatcher meaning
matches nothing. (Fixes #513492)
svn path=/trunk/; revision=6498
2008-02-11 Alexander Larsson <alexl@redhat.com>
+ * gfileinfo.c:
+ (g_file_info_set_attribute_mask):
+ (g_file_attribute_matcher_matches_id):
+ Correctly handle NULL GAttributeMatcher meaning
+ matches nothing. (Fixes #513492)
+
+2008-02-11 Alexander Larsson <alexl@redhat.com>
+
* gfile.[ch]:
* gmount.[ch]:
* gvolume.[ch]:
int i;
g_return_if_fail (G_IS_FILE_INFO (info));
- g_return_if_fail (mask != NULL);
if (mask != info->mask)
{
g_file_attribute_matcher_matches_id (GFileAttributeMatcher *matcher,
guint32 id)
{
- g_return_val_if_fail (matcher != NULL, FALSE);
+ /* We return a NULL matcher for an empty match string, so handle this */
+ if (matcher == NULL)
+ return FALSE;
if (matcher->all)
return TRUE;