luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-09 18:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correctly handle NULL GAttributeMatcher meaning matches nothing. (Fixes

Browse Source 
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
This commit is contained in:
Alexander Larsson
2008-02-11 12:21:49 +00:00
committed by Alexander Larsson
parent e3fdcd1fa7
commit be85960df7
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gio/ChangeLog
View File

@@ -1,3 +1,11 @@
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> 2008-02-11 Alexander Larsson <alexl@redhat.com>
* gfile.[ch]: * gfile.[ch]:

5
gio/gfileinfo.c
View File

@@ -343,7 +343,6 @@ g_file_info_set_attribute_mask (GFileInfo *info,
int i; int i;
g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (G_IS_FILE_INFO (info));
g_return_if_fail (mask != NULL);
if (mask != info->mask) if (mask != info->mask)
{ {
@@ -2035,7 +2034,9 @@ static gboolean
g_file_attribute_matcher_matches_id (GFileAttributeMatcher *matcher, g_file_attribute_matcher_matches_id (GFileAttributeMatcher *matcher,
guint32 id) 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) if (matcher->all)
return TRUE; return TRUE;