rpms/libfprint/devel 0002-Fix-fp_get_pollfds.patch, NONE, 1.1 libfprint.spec, 1.10, 1.11

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/libfprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10081

Modified Files:
	libfprint.spec 
Added Files:
	0002-Fix-fp_get_pollfds.patch 
Log Message:
* Tue Nov 25 2008 - Bastien Nocera <bnocera at redhat.com> - 0.1.0-3.pre1
- Fix possible crasher in libfprint when setting up the fds for polling


0002-Fix-fp_get_pollfds.patch:

--- NEW FILE 0002-Fix-fp_get_pollfds.patch ---
>From 5534d57ddc156582be5ed68f0e3fb6e23c69f6e9 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 25 Nov 2008 15:54:56 +0000
Subject: [PATCH] Fix fp_get_pollfds()

It was increasing i too early, and writing past the allocated
structures.
---
 libfprint/poll.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libfprint/poll.c b/libfprint/poll.c
index a852905..f78b658 100644
--- a/libfprint/poll.c
+++ b/libfprint/poll.c
@@ -308,9 +308,10 @@ API_EXPORTED size_t fp_get_pollfds(struct fp_pollfd **pollfds)
 
 	ret = g_malloc(sizeof(struct fp_pollfd) * cnt);
 	i = 0;
-	while ((usbfd = usbfds[i++]) != NULL) {
+	while ((usbfd = usbfds[i]) != NULL) {
 		ret[i].fd = usbfd->fd;
 		ret[i].events = usbfd->events;
+		i++;
 	}
 
 	*pollfds = ret;
-- 
1.6.0.3



Index: libfprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libfprint/devel/libfprint.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libfprint.spec	24 Nov 2008 12:44:03 -0000	1.10
+++ libfprint.spec	25 Nov 2008 15:59:27 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libfprint
 Version:        0.1.0
-Release:        2.pre1%{?dist}
+Release:        3.pre1%{?dist}
 Summary:        Tool kit for fingerprint scanner
 
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@
 URL:            http://www.reactivated.net/fprint/wiki/Main_Page 
 Source0:        http://downloads.sourceforge.net/fprint/%{name}-0.1.0-pre1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         0002-Fix-fp_get_pollfds.patch
 
 # FIXME remove the ImageMagick dependency when we either have the
 # gdk-pixbuf support merged, or disable the driver that requires it (F10)
@@ -32,7 +33,7 @@
 
 %prep
 %setup -q -n %{name}-0.1.0-pre1
-
+%patch0 -p1
 
 %build
 %configure --disable-static 
@@ -70,6 +71,9 @@
 %{_datadir}/hal/fdi/information/20thirdparty/10-fingerprint-reader-fprint.fdi
 
 %changelog
+* Tue Nov 25 2008 - Bastien Nocera <bnocera at redhat.com> - 0.1.0-3.pre1
+- Fix possible crasher in libfprint when setting up the fds for polling
+
 * Mon Nov 24 2008 - Bastien Nocera <bnocera at redhat.com> - 0.1.0-2.pre1
 - And add some API docs