lib: clear caller's pointer when freeing context struct

The zeromq lib wrapper uses an internal context struct to help
interact with the libfrr event mechanism. When freeing that
context struct, ensure the caller's pointer is also cleared.

Signed-off-by: Mark Stapp <mjs.ietf@gmail.com>

diff --git a/lib/frr_zmq.c b/lib/frr_zmq.c
index ea9c828f7c00af80b564912fefa6a223ca7acca5..994fe656fdd278201675b710f079adbca1802934 100644 (file)
--- a/lib/frr_zmq.c
+++ b/lib/frr_zmq.c
@@ -92,7 +92,8 @@ static int frrzmq_read_msg(struct thread *t)
                                                    ZMQ_POLLOUT);
                                cb->read.thread = NULL;
                                if (cb->write.cancelled && !cb->write.thread)
-                                       XFREE(MTYPE_ZEROMQ_CB, cb);
+                                       XFREE(MTYPE_ZEROMQ_CB, *cbp);
+
                                return 0;
                        }
                        continue;
@@ -120,7 +121,8 @@ static int frrzmq_read_msg(struct thread *t)
                                                    ZMQ_POLLOUT);
                                cb->read.thread = NULL;
                                if (cb->write.cancelled && !cb->write.thread)
-                                       XFREE(MTYPE_ZEROMQ_CB, cb);
+                                       XFREE(MTYPE_ZEROMQ_CB, *cbp);
+
                                return 0;
                        }
 
@@ -239,7 +241,8 @@ static int frrzmq_write_msg(struct thread *t)
                                frrzmq_check_events(cbp, &cb->read, ZMQ_POLLIN);
                                cb->write.thread = NULL;
                                if (cb->read.cancelled && !cb->read.thread)
-                                       XFREE(MTYPE_ZEROMQ_CB, cb);
+                                       XFREE(MTYPE_ZEROMQ_CB, *cbp);
+
                                return 0;
                        }
                        continue;