[954] in BarnOwl Developers
[D-O-H] r941 - branches/barnowl_select/owl
daemon@ATHENA.MIT.EDU (asedeno@MIT.EDU)
Thu Oct 29 18:11:31 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
X-Original-To: nelhage@nelhage.com
To: dirty-owl-hackers@mit.edu
From: asedeno@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Fri, 15 Feb 2008 13:43:31 -0500 (EST)
Author: asedeno
Date: 2008-02-15 13:43:30 -0500 (Fri, 15 Feb 2008)
New Revision: 941
Modified:
branches/barnowl_select/owl/select.c
Log:
eliminate a segfault.
Modified: branches/barnowl_select/owl/select.c
===================================================================
--- branches/barnowl_select/owl/select.c 2008-02-15 05:56:49 UTC (rev 940)
+++ branches/barnowl_select/owl/select.c 2008-02-15 18:43:30 UTC (rev 941)
@@ -134,7 +134,9 @@
len = owl_select_dispatch_count();
for(i = 0; i < len; i++) {
d = (owl_dispatch*)owl_list_get_element(dl, i);
- if (FD_ISSET(d->fd, fds)) {
+ /* While d shouldn't normally be null, the list may be altered by
+ * functions we dispatch to. */
+ if (d != NULL && FD_ISSET(d->fd, fds)) {
if (d->cfunc != NULL) {
(d->cfunc)();
}
