Fix a potential read from a freed buffer when sending data to a blacklisted node.

[meshlink] / test / channels-failure.c

diff --git a/test/channels-failure.c b/test/channels-failure.c
index 34018e1124e472162cea5ec103068c5aa0da8d32..8e17341dd8316c622de546f2edfe296e9987309d 100644 (file)
--- a/test/channels-failure.c
+++ b/test/channels-failure.c
@@ -1,3 +1,7 @@
+#ifdef NDEBUG
+#undef NDEBUG
+#endif
+
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -72,28 +76,59 @@ int main() {
 
        sleep(1);
 
+       // Set a very small timeout for channels to b.
+
+       meshlink_set_node_channel_timeout(mesh_a, b, 1);
+
        // Stop mesh_b. We should get a notification that the channel has closed after a while.
 
        meshlink_stop(mesh_b);
 
-       assert(wait_sync_flag(&receive_flag, 70));
+       assert(wait_sync_flag(&receive_flag, 5));
        assert(receive_len == 0);
 
        meshlink_channel_close(mesh_a, channel);
 
        // Try setting up a new channel while b is still down.
 
-       poll_flag.flag = false;
-       receive_flag.flag = false;
+       set_sync_flag(&poll_flag, false);
+       set_sync_flag(&receive_flag, false);
 
        channel = meshlink_channel_open(mesh_a, b, 7, NULL, NULL, 0);
        assert(channel);
 
        meshlink_set_channel_poll_cb(mesh_a, channel, poll_cb);
 
-       assert(wait_sync_flag(&poll_flag, 70));
+       assert(wait_sync_flag(&poll_flag, 5));
        assert(poll_len == 0);
 
+       meshlink_channel_close(mesh_a, channel);
+
+       // Restart b and create a new channel
+
+       set_sync_flag(&poll_flag, false);
+       set_sync_flag(&receive_flag, false);
+
+       meshlink_set_node_channel_timeout(mesh_a, b, 60);
+
+       assert(meshlink_start(mesh_b));
+
+       channel = meshlink_channel_open(mesh_a, b, 7, receive_cb, NULL, 0);
+       meshlink_set_channel_poll_cb(mesh_a, channel, poll_cb);
+       assert(channel);
+       assert(wait_sync_flag(&poll_flag, 10));
+       assert(poll_len != 0);
+
+       // Close and reopen b, we should get a fast notification that the channel has been closed.
+
+       meshlink_close(mesh_b);
+       mesh_b = meshlink_open("channels_failure_conf.2", "b", "channels_failure", DEV_CLASS_BACKBONE);
+       assert(mesh_b);
+       assert(meshlink_start(mesh_b));
+
+       assert(wait_sync_flag(&receive_flag, 10));
+       assert(receive_len == 0);
+
        // Clean up.
 
        close_meshlink_pair(mesh_a, mesh_b);