Attachment 31076 Details for Bug 24922 – Git formatted potential patch fix

[patch] Git formatted potential patch fix

0001-Move-FD_CLR-above-pInfo-read_input.patch (text/plain), 1.26 KB, created by Chase Douglas on 2009-11-09 19:58:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chase Douglas

Created: 2009-11-09 19:58:16 UTC

Size: 1.26 KB

patch

obsolete

>From b6fd9e237de1a76a963502990f68b14f0975ebb4 Mon Sep 17 00:00:00 2001
>From: Chase Douglas <chasedouglas@gmail.com>
>Date: Mon, 9 Nov 2009 22:54:39 -0500
>Subject: [PATCH] Move FD_CLR above pInfo->read_input
>
>The event fd may be invalidated by the pInfo->read_input call. If it is
>invalidated, the subsequent FD_CLR call will segfault. Thus, the FD_CLR
>call must precede the pInfo->read_input call.
>
>Signed-off-by: Chase Douglas <chasedouglas@gmail.com>
>---
> hw/xfree86/common/xf86Events.c |    5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
>index 9487fe7..8cd765a 100644
>--- a/hw/xfree86/common/xf86Events.c
>+++ b/hw/xfree86/common/xf86Events.c
>@@ -263,13 +263,14 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask)
> 		    (FD_ISSET(pInfo->fd, &devicesWithInput) != 0)) {
> 		    int sigstate = xf86BlockSIGIO();
> 
>-		    pInfo->read_input(pInfo);
>-		    xf86UnblockSIGIO(sigstate);
> 		    /*
> 		     * Remove the descriptior from the set because more than one
> 		     * device may share the same file descriptor.
> 		     */
> 		    FD_CLR(pInfo->fd, &devicesWithInput);
>+
>+		    pInfo->read_input(pInfo);
>+		    xf86UnblockSIGIO(sigstate);
> 		}
> 		pInfo = pInfo->next;
> 	    }
>-- 
>1.6.4.1
>

Actions: View | Splinter Review

Attachments on bug 24922: 31070 | 31076

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.