Attachment 293564 Details for Bug 382321 – Fixes a bug, which continued to iterate on a list, after the list was modified

[patch] Fixes a bug, which continued to iterate on a list, after the list was modified

fvwm-2.5.23-fix-iteration.patch (text/plain), 2.10 KB, created by nvwarr on 2008-01-31 09:56:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nvwarr

Created: 2008-01-31 09:56:24 UTC

Size: 2.10 KB

patch

obsolete

>--- fvwm-2.5.23/fvwm/module_list.h.orig	2008-01-31 09:56:01.000000000 +0100
>+++ fvwm-2.5.23/fvwm/module_list.h	2008-01-31 09:58:42.000000000 +0100
>@@ -148,7 +148,7 @@
>  */
> 
> /* message queues */
> void FlushAllMessageQueues(void);
>-void FlushMessageQueue(fmodule *module);
>+int FlushMessageQueue(fmodule *module);
> 
> 
>--- fvwm-2.5.23/fvwm/module_list.c.orig	2008-01-31 09:54:34.000000000 +0100
>+++ fvwm-2.5.23/fvwm/module_list.c	2008-01-31 09:59:27.000000000 +0100
>@@ -978,7 +978,7 @@
> 	return;
> }
> 
>-void FlushMessageQueue(fmodule *module)
>+int FlushMessageQueue(fmodule *module)
> {
> 	extern int moduleTimeout;
> 	mqueue_object_type *obj;
>@@ -987,7 +987,7 @@
> 
> 	if (module == NULL)
> 	{
>-		return;
>+		return(0);
> 	}
> 
> 	while (fqueue_get_first(&(MOD_PIPEQUEUE(module)), (void **)&obj) == 1)
>@@ -1032,7 +1032,7 @@
> 
> 				if ( isTerminated )
> 				{
>-					return;
>+					return(0);
> 				}
> 				if (!FD_ISSET(channel, &writeSet))
> 				{
>@@ -1050,7 +1050,7 @@
> 						name, rc, isTerminated ?
> 						'Y' : 'N');
> 					module_kill(module);
>-					return;
>+					return(-1); /* We need to reinitialise the iterator */
> 				}
> 
> 				/* pipe accepts further input; continue */
>@@ -1059,13 +1059,13 @@
> 			else if (errno != EINTR)
> 			{
> 				module_kill(module);
>-				return;
>+				return(-1); /* We need to reinitialise the iterator */
> 			}
> 		}
> 		DeleteMessageQueueBuff(module);
> 	}
> 
>-	return;
>+	return(0);
> }
> 
> void FlushAllMessageQueues(void)
>--- fvwm-2.5.23/fvwm/events.c.orig	2008-01-31 09:54:27.000000000 +0100
>+++ fvwm-2.5.23/fvwm/events.c	2008-01-31 09:58:24.000000000 +0100
>@@ -4121,6 +4121,7 @@
> 		module_list_itr_init(&moditr);
> 		while ( (module = module_list_itr_next(&moditr)) != NULL)
> 		{
>+		        int status;
> 			if (FD_ISSET(MOD_READFD(module), &in_fdset))
> 			{
> 				input = module_receive(module);
>@@ -4133,7 +4134,12 @@
> 			{
> 				DBUG("My_XNextEvent",
> 				     "calling FlushMessageQueue");
>-				FlushMessageQueue(module);
>+				status = FlushMessageQueue(module);
>+			   
>+			        /* If we changed the list, we need to
>+				 * reinitialise the iterator */
>+			   
>+			        if (status) module_list_itr_init(&moditr);
> 			}
> 		}
>

Actions: View | Diff

Attachments on bug 382321: 257981 | 280791 | 293564 | 294305