Do not segfault when closing last connection (#83)

3cky · Apr 6, 2022 · 874ce63 · 874ce63
1 parent 06ccb29
commit 874ce63
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/conn.c b/src/conn.c
@@ -192,6 +192,7 @@ conn_close(conn_t *conn)
   nextconn = queue_next_elem(&queue, conn);
   /* dequeue connection */
   queue_delete_elem(&queue, conn);
+  if (nextconn == conn) nextconn = NULL;
   if (actconn == conn) actconn = nextconn;
   return nextconn;
 }

diff --git a/src/queue.c b/src/queue.c
@@ -115,5 +115,5 @@ queue_delete_elem(queue_t *queue, conn_t *conn)
 conn_t *
 queue_next_elem(queue_t *queue, conn_t *conn)
 {
-  return (conn->next == NULL) ? queue->beg : conn->next;
+  return (conn == NULL || conn->next == NULL) ? queue->beg : conn->next;
 }