Changeset fc2ee0f for protocols/events_libevent.c

Timestamp:

2006-05-13T10:29:53Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2b7d2d1

Parents:

b642f381

Message:

It works, it works! \o/

File:

• protocols/events_libevent.c (modified) (3 diffs)

protocols/events_libevent.c

@@ -72 +72 @@
         struct b_event_data *b_ev = data;
         b_input_condition cond = 0;
+        int id;
         
         if( fd >= 0 )
@@ -83 +84 @@
         event_debug( "b_event_passthrough( %d, %d, 0x%x ) (%d)\n", fd, event, (int) data, b_ev->id );
         
+        /* Since the called function might cancel this handler already
+           (which free()s b_ev, we have to remember the ID here. */
+        id = b_ev->id;
+        
         if( !b_ev->function( b_ev->data, fd, cond ) )
         {
                 event_debug( "Handler returned FALSE: " );
-                b_event_remove( b_ev->id );
+                b_event_remove( id );
         }
 }
@@ -151 +156 @@
         else
         {
-                event_debug( "Invalid?\n" );
+                event_debug( "Double remove?\n" );
         }
 }