eigrpd, lib, tests, vtysh: security (cppcheck)

Signed-off-by: F. Aragon <paco@voltanet.io>

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/frr_zmq.c b/lib/frr_zmq.c
index 8f190a3a09..3153e697fa 100644
--- a/lib/frr_zmq.c
+++ b/lib/frr_zmq.c
@@ -174,9 +174,10 @@ int funcname_frrzmq_thread_add_read(struct thread_master *master,
 		cb = *cbp;
 	else {
 		cb = XCALLOC(MTYPE_ZEROMQ_CB, sizeof(struct frrzmq_cb));
-		cb->write.cancelled = 1;
 		if (!cb)
 			return -1;
+
+		cb->write.cancelled = 1;
 		*cbp = cb;
 	}
 
@@ -282,9 +283,10 @@ int funcname_frrzmq_thread_add_write(struct thread_master *master,
 		cb = *cbp;
 	else {
 		cb = XCALLOC(MTYPE_ZEROMQ_CB, sizeof(struct frrzmq_cb));
-		cb->read.cancelled = 1;
 		if (!cb)
 			return -1;
+
+		cb->read.cancelled = 1;
 		*cbp = cb;
 	}