fix server crash if log connection fails

[disorder] / server / server.c

diff --git a/server/server.c b/server/server.c
index 89447c00dacf85f55ed38466d5c0a75a69c5d52b..6bfee6b67323b8332c34c0710a80307943831012 100644 (file)
--- a/server/server.c
+++ b/server/server.c
@@ -116,10 +116,14 @@ static int writer_error(ev_source attribute((unused)) *ev,
   } else {
     if(errno_value != EPIPE)
       error(errno_value, "S%x write error on socket", c->tag);
-    info("cancel reader");
-    ev_reader_cancel(c->r);
+    if(c->r) {
+      info("cancel reader");
+      ev_reader_cancel(c->r);
+      c->r = 0;
+    }
     info("done cancel reader");
   }
+  c->w = 0;
   ev_report(ev);
   return 0;
 }
@@ -132,7 +136,10 @@ static int reader_error(ev_source attribute((unused)) *ev,
   D(("server reader_error %d", errno_value));
   info("reader_error S%x %d", c->tag, errno_value);
   error(errno_value, "S%x read error on socket", c->tag);
-  ev_writer_close(c->w);
+  if(c->w)
+    ev_writer_close(c->w);
+  c->w = 0;
+  c->r = 0;
   ev_report(ev);
   return 0;
 }