Fix crash when the write queue for a disconnected client is non-empty

Reported by Jim Leonard.

2 files changed, 4 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index ca45883..5ffaff4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ UNRELEASED
   * 422 message is now sent after registration when no MOTD is available.
   * Added support for WALLOPS command.
   * Added option to store persistent state (currently channel topic and key).
+  * Fixed crash when the write queue for a disconnected client is non-empty.
 
 0.3 2011-08-25
 
diff --git a/miniircd b/miniircd
index 4d6bfc9..c348520 100755
--- a/miniircd
+++ b/miniircd
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 # Hey, Emacs! This is -*-python-*-.
 #
-# Copyright (C) 2003, 2011 Joel Rosdahl
+# Copyright (C) 2003, 2011-2012 Joel Rosdahl
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -753,7 +753,8 @@ class Server(object):
                     self.print_info("Accepted connection from %s:%s." % (
                         addr[0], addr[1]))
             for x in owtd:
-                self.clients[x].socket_writable_notification()
+                if x in self.clients: # client may have been disconnected
+                    self.clients[x].socket_writable_notification()
             now = time.time()
             if last_aliveness_check + 10 < now:
                 for client in self.clients.values():