From b80fb24a5dac679822b1454a1593871bb0ae0e8d Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 10 Oct 2009 17:31:26 +0000 Subject: Fix another leak in the case of an error. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13107 df743ca5-7f9a-e211-a948-0013205c9059 --- sysutils/brasero/Makefile | 4 ++-- sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile index faa792e25..e1813ca9c 100644 --- a/sysutils/brasero/Makefile +++ b/sysutils/brasero/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson # # $FreeBSD$ -# $MCom: ports/sysutils/brasero/Makefile,v 1.55 2009/10/05 18:47:45 kwm Exp $ +# $MCom: ports/sysutils/brasero/Makefile,v 1.56 2009/10/09 03:59:15 marcus Exp $ PORTNAME= brasero PORTVERSION= 2.28.1 -PORTREVISION= 1 +PORTREVISION= 2 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 index 848148295..e342112f8 100644 --- a/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c +++ b/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c @@ -1,5 +1,5 @@ --- libbrasero-media/scsi-cam.c.orig 2009-09-25 10:39:03.000000000 -0400 -+++ libbrasero-media/scsi-cam.c 2009-10-09 00:06:22.000000000 -0400 ++++ libbrasero-media/scsi-cam.c 2009-10-10 13:30:06.000000000 -0400 @@ -184,6 +184,8 @@ brasero_device_handle_open (const gchar handle->fd = fd; } @@ -9,7 +9,7 @@ if (code) { if (errno == EAGAIN || errno == EWOULDBLOCK -@@ -193,6 +195,13 @@ brasero_device_handle_open (const gchar +@@ -193,6 +195,15 @@ brasero_device_handle_open (const gchar *code = BRASERO_SCSI_ERRNO; } @@ -17,6 +17,8 @@ + + if (fd > -1) + close (fd); ++ if (cam) ++ cam_close_device (cam); + + errno = serrno; + -- cgit v1.2.3