cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Protect more calls to xdg_mime* functions with mime_mutex to avoid

Browse Source 
re-entrancy crashes.
This commit is contained in:
Joe Marcus Clarke 2005-03-20 00:11:43 +00:00
parent 1727d3d0cd
commit e32963fa06
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=131676
4 changed files with 78 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devel/gnome-vfs/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= gnomevfs2
PORTVERSION= 2.10.0
PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-vfs/2.10

38
devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c Normal file
View File

@ -0,0 +1,38 @@
--- libgnomevfs/gnome-vfs-mime.c.orig Sat Mar 19 18:59:45 2005
+++ libgnomevfs/gnome-vfs-mime.c Sat Mar 19 19:02:24 2005
@@ -167,7 +167,9 @@
GnomeVFSResult result = GNOME_VFS_OK;
const char *mime_type;
+ G_LOCK (mime_mutex);
max_extents = xdg_mime_get_max_buffer_extents ();
+ G_UNLOCK (mime_mutex);
max_extents = CLAMP (max_extents, 0, MAX_SNIFF_BUFFER_ALLOWED);
if (!buffer->read_whole_file) {
@@ -592,7 +594,9 @@
g_return_val_if_fail (a != NULL, FALSE);
g_return_val_if_fail (b != NULL, FALSE);
+ G_LOCK (mime_mutex);
xdg_mime_mime_type_equal (a, b);
+ G_UNLOCK (mime_mutex);
return FALSE;
}
@@ -626,8 +630,13 @@
if (gnome_vfs_mime_type_is_equal (mime_type, base_mime_type)) {
return GNOME_VFS_MIME_IDENTICAL;
- } else if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) {
- return GNOME_VFS_MIME_PARENT;
+ } else {
+ G_LOCK (mime_mutex);
+ if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) {
+ G_UNLOCK (mime_mutex);
+ return GNOME_VFS_MIME_PARENT;
+ }
+ G_UNLOCK (mime_mutex);
}
return GNOME_VFS_MIME_UNRELATED;

1
devel/gnomevfs2/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= gnomevfs2
PORTVERSION= 2.10.0
PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-vfs/2.10

38
devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c Normal file
View File

@ -0,0 +1,38 @@
--- libgnomevfs/gnome-vfs-mime.c.orig Sat Mar 19 18:59:45 2005
+++ libgnomevfs/gnome-vfs-mime.c Sat Mar 19 19:02:24 2005
@@ -167,7 +167,9 @@
GnomeVFSResult result = GNOME_VFS_OK;
const char *mime_type;
+ G_LOCK (mime_mutex);
max_extents = xdg_mime_get_max_buffer_extents ();
+ G_UNLOCK (mime_mutex);
max_extents = CLAMP (max_extents, 0, MAX_SNIFF_BUFFER_ALLOWED);
if (!buffer->read_whole_file) {
@@ -592,7 +594,9 @@
g_return_val_if_fail (a != NULL, FALSE);
g_return_val_if_fail (b != NULL, FALSE);
+ G_LOCK (mime_mutex);
xdg_mime_mime_type_equal (a, b);
+ G_UNLOCK (mime_mutex);
return FALSE;
}
@@ -626,8 +630,13 @@
if (gnome_vfs_mime_type_is_equal (mime_type, base_mime_type)) {
return GNOME_VFS_MIME_IDENTICAL;
- } else if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) {
- return GNOME_VFS_MIME_PARENT;
+ } else {
+ G_LOCK (mime_mutex);
+ if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) {
+ G_UNLOCK (mime_mutex);
+ return GNOME_VFS_MIME_PARENT;
+ }
+ G_UNLOCK (mime_mutex);
}
return GNOME_VFS_MIME_UNRELATED;