rpms/xorg-x11-drv-fpit/F-11 fpit-1.3.0-unload.patch, NONE, 1.1 xorg-x11-drv-fpit.spec, 1.19, 1.20

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-fpit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19285

Modified Files:
	xorg-x11-drv-fpit.spec 
Added Files:
	fpit-1.3.0-unload.patch 
Log Message:
* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-3
- fpit-1.3.0-unload.patch: avoide some double-frees (#473366)


fpit-1.3.0-unload.patch:
 xf86Fpit.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE fpit-1.3.0-unload.patch ---
>From 7dacfde39a027bb868493ba075e2f1d787c9b191 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri, 28 Aug 2009 08:16:36 +1000
Subject: [PATCH] Fix module unloading.

After calling xfree(priv), local->private must be set NULL.
Otherwise the server tries to free it again during xf86DeleteInput.

local->name must not be freed, it is set to XI_TOUCHSCREEN during PreInit.

local must not be freed, we pass it into xf86DeleteInput.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/xf86Fpit.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
index f40c6a9..ce7540b 100644
--- a/src/xf86Fpit.c
+++ b/src/xf86Fpit.c
@@ -589,8 +589,7 @@ static void xf86FpitUninit(InputDriverPtr drv, LocalDevicePtr local, int flags)
 	xf86FpitControl(local->dev, DEVICE_OFF);
 	xfree(priv->fpitDev);
 	xfree(priv);
-	xfree(local->name);
-	xfree(local);
+	local->private = NULL;
 	xf86DeleteInput(local, 0);
 }
 
-- 
1.6.3.rc1.2.g0164.dirty



Index: xorg-x11-drv-fpit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-fpit/F-11/xorg-x11-drv-fpit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xorg-x11-drv-fpit.spec	26 Feb 2009 10:47:34 -0000	1.19
+++ xorg-x11-drv-fpit.spec	27 Aug 2009 22:30:51 -0000	1.20
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 fpit input driver
 Name:      xorg-x11-drv-fpit
 Version: 1.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,6 +14,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   10-fpit.fdi
 
+# Taken from upstream.
+Patch1:    fpit-1.3.0-unload.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
@@ -25,6 +28,7 @@ X.Org X11 fpit input driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch1 -p1 -b .unload
 
 %build
 %configure --disable-static
@@ -52,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hal/fdi/policy/20thirdparty/10-fpit.fdi
 
 %changelog
+* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-3
+- fpit-1.3.0-unload.patch: avoide some double-frees (#473366)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild