From 6b9a85376cf4aa273a1a37edf9e3d30c05fe4f4b Mon Sep 17 00:00:00 2001 From: Mark Haverkamp Date: Wed, 23 Mar 2005 20:12:44 +0000 Subject: [PATCH] Only dispatch a callback if it is non-null. (Logical change 1.158) git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@550 fd59a12c-fef9-0310-b244-a6a79926bd2f --- lib/evt.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/lib/evt.c b/lib/evt.c index f4c5eabc..108843f6 100644 --- a/lib/evt.c +++ b/lib/evt.c @@ -608,8 +608,14 @@ saEvtDispatch( if (error != SA_AIS_OK) { break; } - callbacks.saEvtEventDeliverCallback(evt->led_sub_id, event_handle, - evt->led_user_data_size); + + /* + * Only call if there was a function registered + */ + if (callbacks.saEvtEventDeliverCallback) { + callbacks.saEvtEventDeliverCallback(evt->led_sub_id, + event_handle, evt->led_user_data_size); + } break; case MESSAGE_RES_EVT_CHAN_OPEN_CALLBACK: @@ -635,8 +641,14 @@ saEvtDispatch( resa->ica_c_handle); } } - callbacks.saEvtChannelOpenCallback(resa->ica_invocation, + + /* + * Only call if there was a function registered + */ + if (callbacks.saEvtChannelOpenCallback) { + callbacks.saEvtChannelOpenCallback(resa->ica_invocation, resa->ica_c_handle, error); + } } break;