Attachment 6764 Details for Bug 8358 – Patch for 3.6

[patch] Patch for 3.6

v3-6-test-Fix-a-bug-in-run_poll_events.patch (text/plain), 1.25 KB, created by Andreas Schneider on 2011-08-09 08:47:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2011-08-09 08:47:06 UTC

Size: 1.25 KB

patch

obsolete

>From 471a330a45052e448a405fce83d1168ab8435a23 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Mon, 8 Aug 2011 18:49:06 +0200
>Subject: [PATCH] s3:lib/events: Fix a bug in run_poll_events().
>
>Ignore fd events without EVENT_FD_READ or EVENT_FD_WRITE also in
>run_events_poll(). They are ignore when building the array
>for the syscall in event_add_to_poll_args(), so we need to
>ignore them run_events_poll() too.
>
>metze
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>
>Autobuild-User: Stefan Metzmacher <metze@samba.org>
>Autobuild-Date: Tue Aug  9 10:11:54 CEST 2011 on sn-devel-104
>(cherry picked from commit 020032e114c0e966acf24f24e707942219d60cf3)
>---
> source3/lib/events.c |    4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
>diff --git a/source3/lib/events.c b/source3/lib/events.c
>index fbe3db9..5631436 100644
>--- a/source3/lib/events.c
>+++ b/source3/lib/events.c
>@@ -243,6 +243,10 @@ bool run_events_poll(struct tevent_context *ev, int pollrtn,
> 		struct pollfd *pfd;
> 		uint16 flags = 0;
> 
>+		if ((fde->flags & (EVENT_FD_READ|EVENT_FD_WRITE)) == 0) {
>+			continue;
>+		}
>+
> 		if (pollfd_idx[fde->fd] >= num_pfds) {
> 			DEBUG(1, ("internal error: pollfd_idx[fde->fd] (%d) "
> 				  ">= num_pfds (%d)\n", pollfd_idx[fde->fd],
>-- 
>1.7.6
>

Flags:

vl: review+
asn: review+

Actions: View

Attachments on bug 8358: 6764