rpms/libraw1394/F-7 libraw1394-juju-no-double-free-on-shutdown.patch, NONE, 1.1 libraw1394.spec, 1.34, 1.35

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/libraw1394/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4957

Modified Files:
	libraw1394.spec 
Added Files:
	libraw1394-juju-no-double-free-on-shutdown.patch 
Log Message:
Fix double-free triggered on pre-ohci 1.1 controllers (#328011)

libraw1394-juju-no-double-free-on-shutdown.patch:

--- NEW FILE libraw1394-juju-no-double-free-on-shutdown.patch ---
diff -Naurp libraw1394-1.3.0/juju/raw1394-iso.c libraw1394-1.3.0.fix/juju/raw1394-iso.c
--- libraw1394-1.3.0/juju/raw1394-iso.c	2007-10-19 16:05:09.000000000 -0400
+++ libraw1394-1.3.0.fix/juju/raw1394-iso.c	2007-10-19 17:14:40.000000000 -0400
@@ -394,6 +394,7 @@ iso_init(raw1394handle_t handle, int typ
 	handle->iso.fd = open(handle->local_filename, O_RDWR);
 	if (handle->iso.fd < 0) {
 		free(handle->iso.packets);
+		handle->iso.packets = NULL;
 		return -1;
 	}
 
@@ -404,6 +405,7 @@ iso_init(raw1394handle_t handle, int typ
 		      handle->iso.fd, &ep) < 0) {
 		close(handle->iso.fd);
 		free(handle->iso.packets);
+		handle->iso.packets = NULL;
 		return -1;
 	}
 
@@ -417,6 +419,8 @@ iso_init(raw1394handle_t handle, int typ
 	if (retval < 0) {
 		close(handle->iso.fd);
 		free(handle->iso.packets);
+		handle->iso.packets = NULL;
+		printf("ioctl call failed, retval = %d\n", retval);
 		return retval;
 	}
 
@@ -427,6 +431,7 @@ iso_init(raw1394handle_t handle, int typ
 	if (handle->iso.buffer == MAP_FAILED) {
 		close(handle->iso.fd);
 		free(handle->iso.packets);
+		handle->iso.packets = NULL;
 		return -1;
 	}
 


Index: libraw1394.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/F-7/libraw1394.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libraw1394.spec	16 Jun 2007 03:07:11 -0000	1.34
+++ libraw1394.spec	21 Oct 2007 19:51:07 -0000	1.35
@@ -1,7 +1,7 @@
 Summary:        Library providing low-level IEEE-1394 access
 Name:           libraw1394
 Version:        1.2.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
@@ -12,6 +12,7 @@
 
 Source1:        firewire-cdev.h
 Patch0:         libraw1394-juju.patch
+Patch1:         libraw1394-juju-no-double-free-on-shutdown.patch
 
 %description
 The libraw1394 library provides direct access to the IEEE-1394 bus through
@@ -29,6 +30,7 @@
 %setup -q
 
 %patch0 -p1 -b .juju
+%patch1 -p1 -b .free
 
 %build
 
@@ -77,6 +79,9 @@
 
 
 %changelog
+* Sun Oct 21 2007 Jarod Wilson <jwilson at redhat.com> - 1.2.1-10
+- Fix double-free triggered on pre-ohci 1.1 controllers (#328011)
+
 * Fri Jun 15 2007 Jarod Wilson <jwilson at redhat.com> - 1.2.1-9
 - Drop Conficts, causes interesting issues if people have an
   older kernel installed and/or kernel-xen installed (#244474)