- Fix to use assertions for consistency checks in #1309 reclaimed

diff --git a/doc/Changelog b/doc/Changelog
index e1d3e5b45a83eb54ba62b42c3a339281e96a0eb5..e42128f1c281fe312d25bec7644440f763dcd05d 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 5 August 2025: Wouter
        - Fix #1309: incorrectly reclaimed tcp handler can cause data
          corruption and segfault.
 5 August 2025: Wouter
        - Fix #1309: incorrectly reclaimed tcp handler can cause data
          corruption and segfault.

+       - Fix to use assertions for consistency checks in #1309 reclaimed
+         tcp handlers.

 
 1 August 2025: Wouter
        - Fix testbound test program to accurately output packets from hex.
 
 1 August 2025: Wouter
        - Fix testbound test program to accurately output packets from hex.

diff --git a/util/netevent.c b/util/netevent.c
index 952efc11173ae18e104b525352a69cb5fb8cf36d..0756dc26c4adc9fc93aa6b26a0a80b867ab580e3 100644 (file)
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -3218,10 +3218,9 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg)
        }
        /* accept incoming connection. */
        c_hdl = c->tcp_free;
        }
        /* accept incoming connection. */
        c_hdl = c->tcp_free;

-       if(!c_hdl->is_in_tcp_free) {
-               /* Should not happen */
-               fatal_exit("inconsistent tcp_free state in accept_callback");
-       }
+       /* Should not happen: inconsistent tcp_free state in
+        * accept_callback. */
+       log_assert(c_hdl->is_in_tcp_free);

        /* clear leftover flags from previous use, and then set the
         * correct event base for the event structure for libevent */
        ub_event_free(c_hdl->ev->ev);
        /* clear leftover flags from previous use, and then set the
         * correct event base for the event structure for libevent */
        ub_event_free(c_hdl->ev->ev);


@@ -3297,10 +3296,9 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg)
        }
 
        /* Paranoia: Check that the state has not changed from above: */
        }
 
        /* Paranoia: Check that the state has not changed from above: */

-       if(c_hdl != c->tcp_free || !c_hdl->is_in_tcp_free) {
-               /* Should not happen */
-               fatal_exit("tcp_free state changed within accept_callback!");
-       }
+       /* Should not happen: tcp_free state changed within accept_callback. */
+       log_assert(c_hdl == c->tcp_free);
+       log_assert(c_hdl->is_in_tcp_free);

        /* grab the tcp handler buffers */
        c->cur_tcp_count++;
        c->tcp_free = c_hdl->tcp_free;
        /* grab the tcp handler buffers */
        c->cur_tcp_count++;
        c->tcp_free = c_hdl->tcp_free;


@@ -3327,10 +3325,9 @@ reclaim_tcp_handler(struct comm_point* c)
        }
        comm_point_close(c);
        if(c->tcp_parent && !c->is_in_tcp_free) {
        }
        comm_point_close(c);
        if(c->tcp_parent && !c->is_in_tcp_free) {

-               if(c->tcp_free || c->tcp_parent->cur_tcp_count <= 0) {
-                       /* Should not happen */
-                       fatal_exit("bad tcp_free state in reclaim_tcp");
-               }
+               /* Should not happen: bad tcp_free state in reclaim_tcp. */
+               log_assert(c->tcp_free == NULL);
+               log_assert(c->tcp_parent->cur_tcp_count > 0);

                c->tcp_parent->cur_tcp_count--;
                c->tcp_free = c->tcp_parent->tcp_free;
                c->tcp_parent->tcp_free = c;
                c->tcp_parent->cur_tcp_count--;
                c->tcp_free = c->tcp_parent->tcp_free;
                c->tcp_parent->tcp_free = c;


@@ -4721,10 +4718,9 @@ reclaim_http_handler(struct comm_point* c)
        }
        comm_point_close(c);
        if(c->tcp_parent && !c->is_in_tcp_free) {
        }
        comm_point_close(c);
        if(c->tcp_parent && !c->is_in_tcp_free) {

-               if(c->tcp_free || c->tcp_parent->cur_tcp_count <= 0) {
-                       /* Should not happen */
-                       fatal_exit("bad tcp_free state in reclaim_http");
-               }
+               /* Should not happen: bad tcp_free state in reclaim_http. */
+               log_assert(c->tcp_free == NULL);
+               log_assert(c->tcp_parent->cur_tcp_count > 0);

                c->tcp_parent->cur_tcp_count--;
                c->tcp_free = c->tcp_parent->tcp_free;
                c->tcp_parent->tcp_free = c;
                c->tcp_parent->cur_tcp_count--;
                c->tcp_free = c->tcp_parent->tcp_free;
                c->tcp_parent->tcp_free = c;