fixup tcp accept.

git-svn-id: file:///svn/unbound/trunk@1364 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 4963a3b397cf8adf625ffcb9a938f221041b4cc6..6a0eeca865f7a5f35565634c1ed5f8d7a1875edb 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+20 November 2008: Wouter
+       - fixup fatal error due to faulty error checking after tcp accept.
+
 19 November 2008: Wouter
        - bug #219: fixed so that syslog which delays opening until the first
          log line is written, gets a log line while not chroot'ed yet.

diff --git a/util/netevent.c b/util/netevent.c
index 390a00ec6dffc72991eabb7fc197229ee85631d2..056183656ecee7e4e92d4ffae35f5553c70ef7a0 100644 (file)
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -605,6 +605,8 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg)
        log_assert(fd != -1);
        new_fd = comm_point_perform_accept(c, &c_hdl->repinfo.addr,
                &c_hdl->repinfo.addrlen);
+       if(new_fd == -1)
+               return;
 
        /* grab the tcp handler buffers */
        c->tcp_free = c_hdl->tcp_free;