From a3d982007e38310b4e2b15147793ae767fcaba59 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 6 Feb 2002 19:45:56 +0000 Subject: [PATCH] Handle NULL entries (already dispatched) in pending_dispatches array Wed Feb 6 14:44:18 2002 Owen Taylor * glib/gmain.c (g_main_context_prepare): Handle NULL entries (already dispatched) in pending_dispatches array (pointed out by Manish Singh) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib/gmain.c | 5 ++++- 9 files changed, 52 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 880dc31..b3b5c91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Feb 6 14:44:18 2002 Owen Taylor + + * glib/gmain.c (g_main_context_prepare): Handle + NULL entries (already dispatched) in pending_dispatches array + (pointed out by Manish Singh) + Tue Feb 5 17:13:02 2002 Owen Taylor * glib/gmain.c (g_main_context_prepare): Unref pending diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 880dc31..b3b5c91 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Wed Feb 6 14:44:18 2002 Owen Taylor + + * glib/gmain.c (g_main_context_prepare): Handle + NULL entries (already dispatched) in pending_dispatches array + (pointed out by Manish Singh) + Tue Feb 5 17:13:02 2002 Owen Taylor * glib/gmain.c (g_main_context_prepare): Unref pending diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 880dc31..b3b5c91 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Feb 6 14:44:18 2002 Owen Taylor + + * glib/gmain.c (g_main_context_prepare): Handle + NULL entries (already dispatched) in pending_dispatches array + (pointed out by Manish Singh) + Tue Feb 5 17:13:02 2002 Owen Taylor * glib/gmain.c (g_main_context_prepare): Unref pending diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 880dc31..b3b5c91 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Wed Feb 6 14:44:18 2002 Owen Taylor + + * glib/gmain.c (g_main_context_prepare): Handle + NULL entries (already dispatched) in pending_dispatches array + (pointed out by Manish Singh) + Tue Feb 5 17:13:02 2002 Owen Taylor * glib/gmain.c (g_main_context_prepare): Unref pending diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 880dc31..b3b5c91 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Wed Feb 6 14:44:18 2002 Owen Taylor + + * glib/gmain.c (g_main_context_prepare): Handle + NULL entries (already dispatched) in pending_dispatches array + (pointed out by Manish Singh) + Tue Feb 5 17:13:02 2002 Owen Taylor * glib/gmain.c (g_main_context_prepare): Unref pending diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 880dc31..b3b5c91 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed Feb 6 14:44:18 2002 Owen Taylor + + * glib/gmain.c (g_main_context_prepare): Handle + NULL entries (already dispatched) in pending_dispatches array + (pointed out by Manish Singh) + Tue Feb 5 17:13:02 2002 Owen Taylor * glib/gmain.c (g_main_context_prepare): Unref pending diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 880dc31..b3b5c91 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed Feb 6 14:44:18 2002 Owen Taylor + + * glib/gmain.c (g_main_context_prepare): Handle + NULL entries (already dispatched) in pending_dispatches array + (pointed out by Manish Singh) + Tue Feb 5 17:13:02 2002 Owen Taylor * glib/gmain.c (g_main_context_prepare): Unref pending diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 880dc31..b3b5c91 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Feb 6 14:44:18 2002 Owen Taylor + + * glib/gmain.c (g_main_context_prepare): Handle + NULL entries (already dispatched) in pending_dispatches array + (pointed out by Manish Singh) + Tue Feb 5 17:13:02 2002 Owen Taylor * glib/gmain.c (g_main_context_prepare): Unref pending diff --git a/glib/gmain.c b/glib/gmain.c index 6f0c2bf..3bbcc06 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -1892,7 +1892,10 @@ g_main_context_prepare (GMainContext *context, /* If recursing, clear list of pending dispatches */ for (i = 0; i < context->pending_dispatches->len; i++) - SOURCE_UNREF ((GSource *)context->pending_dispatches->pdata[i], context); + { + if (context->pending_dispatches->pdata[i]) + SOURCE_UNREF ((GSource *)context->pending_dispatches->pdata[i], context); + } g_ptr_array_set_size (context->pending_dispatches, 0); /* Prepare all sources */ -- 2.7.4