From 12f311b780b5b46ce7594fd244d9d95a92b233e7 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Wed, 13 Sep 2023 17:03:17 +0200
Subject: [PATCH] dbEvent minor

---
 modules/database/src/ioc/db/dbEvent.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/database/src/ioc/db/dbEvent.c b/modules/database/src/ioc/db/dbEvent.c
index d5c930dfc..653ea411c 100644
--- a/modules/database/src/ioc/db/dbEvent.c
+++ b/modules/database/src/ioc/db/dbEvent.c
@@ -1017,6 +1017,7 @@ static int event_read ( struct event_que *ev_que )
                 notifiedRemaining = eventsRemaining;
             }
             LOCKEVQUE (ev_que);
+            /* concurrent db_cancel_event() may have free()'d pevent */
 
             /*
              * check to see if this event has been canceled each
@@ -1029,13 +1030,10 @@ static int event_read ( struct event_que *ev_que )
                 ev_que->evUser->pSuicideEvent = NULL;
             }
             else {
+                pevent->callBackInProgress = FALSE;
                 if ( pevent->user_sub==NULL && pevent->npend==0u ) {
-                    pevent->callBackInProgress = FALSE;
                     epicsEventSignal ( ev_que->evUser->pflush_sem );
                 }
-                else {
-                    pevent->callBackInProgress = FALSE;
-                }
             }
         }
         db_delete_field_log(pfl);