Index: dbEvent.c
===================================================================
RCS file: /usr/local/epicsmgr/cvsroot/epics/base/src/db/dbEvent.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- dbEvent.c	23 Sep 2002 22:09:42 -0000	1.95
+++ dbEvent.c	30 Jan 2003 15:48:41 -0000	1.96
@@ -531,12 +531,15 @@
      * would be possible.
      */
     for (   getix = pevent->ev_que->getix; 
-            pevent->ev_que->evque[getix] != EVENTQEMPTY; 
-            getix = RNGINC ( getix ) ) {
+            pevent->ev_que->evque[getix] != EVENTQEMPTY; ) {
         if ( pevent->ev_que->evque[getix] == pevent ) {
             assert ( pevent->ev_que->nCanceled < USHRT_MAX );
             pevent->ev_que->nCanceled++;
             event_remove ( pevent->ev_que, getix, &canceledEvent );
+        }
+        getix = RNGINC ( getix );
+        if ( getix == pevent->ev_que->getix ) {
+            break;
         }
     }
     assert ( pevent->npend == 0u );