summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-10-09 11:59:16 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-10-09 11:59:16 +0800
commit7f326fcef006bcfc7b7c440a84e4431821b34d46 (patch)
tree15291eb0c7294889eae61e1efe0736958b49a529
parent4b4bf61af48510c9b0c614bde998a58d20d844b3 (diff)
downloadmarcuscom-ports-7f326fcef006bcfc7b7c440a84e4431821b34d46.tar
marcuscom-ports-7f326fcef006bcfc7b7c440a84e4431821b34d46.tar.gz
marcuscom-ports-7f326fcef006bcfc7b7c440a84e4431821b34d46.tar.bz2
marcuscom-ports-7f326fcef006bcfc7b7c440a84e4431821b34d46.tar.lz
marcuscom-ports-7f326fcef006bcfc7b7c440a84e4431821b34d46.tar.xz
marcuscom-ports-7f326fcef006bcfc7b7c440a84e4431821b34d46.tar.zst
marcuscom-ports-7f326fcef006bcfc7b7c440a84e4431821b34d46.zip
When opening a device fails, be sure to close the file descriptor, or we
will leak descriptors, and possibly prevent device mounting. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13102 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--sysutils/brasero/Makefile3
-rw-r--r--sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c12
2 files changed, 14 insertions, 1 deletions
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 74e5d8e21..faa792e25 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -3,10 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/brasero/Makefile,v 1.54 2009/09/21 19:19:27 kwm Exp $
+# $MCom: ports/sysutils/brasero/Makefile,v 1.55 2009/10/05 18:47:45 kwm Exp $
PORTNAME= brasero
PORTVERSION= 2.28.1
+PORTREVISION= 1
CATEGORIES= sysutils audio multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c b/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c
new file mode 100644
index 000000000..fe31c298c
--- /dev/null
+++ b/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c
@@ -0,0 +1,12 @@
+--- libbrasero-media/scsi-cam.c.orig 2009-10-08 22:34:11.000000000 -0400
++++ libbrasero-media/scsi-cam.c 2009-10-08 22:35:09.000000000 -0400
+@@ -193,6 +193,9 @@ brasero_device_handle_open (const gchar
+ *code = BRASERO_SCSI_ERRNO;
+ }
+
++ if (fd > -1)
++ close (fd);
++
+ return NULL;
+ }
+