Changeset 05725694

Timestamp:

Jul 12, 2011, 11:27:01 PM (12 years ago)

Author:

David Benjamin <davidben@mit.edu>

Children:

117a955

Parents:

24b2f18

Message:

Don't remove GPollFDs in a source's finalize

Arguably this was somewhat of a poor move on glib's part, but you trip
over an assert if you remove a poll from a destroyed source. (This is
distinct from an unref; a source gets the destroyed flag when it is
removed from its GMainContext, and it is finalized when it loses all its
references.)

Reported-by: Edward Z. Yang <ezyang@mit.edu>

File:

• aim.c (modified) (1 diff)

aim.c

@@ -1891 +1891 @@
 {
   owl_aim_event_source *event_source = (owl_aim_event_source*)source;
-  truncate_pollfd_list(event_source, 0);
-  g_ptr_array_free(event_source->fds, TRUE);
+  /* Don't remove the GPollFDs. We are being finalized, so they'll be removed
+   * for us. Moreover, glib will fire asserts if g_source_remove_poll is called
+   * on a source which has been destroyed (which occurs when g_source_remove is
+   * called on it). */
+  owl_ptr_array_free(event_source->fds, g_free);
 }