From f5e3efd6013ee104d3310b5910607034c552e4db Mon Sep 17 00:00:00 2001 From: paulo Date: Wed, 16 Dec 2009 15:46:12 +0000 Subject: Fix race condition when threads start. Make memory stats thread safe Run memory commands in cli thread. --- lib/command_queue.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/command_queue.c') diff --git a/lib/command_queue.c b/lib/command_queue.c index 902cd89c..9ca32e19 100644 --- a/lib/command_queue.c +++ b/lib/command_queue.c @@ -49,7 +49,7 @@ cq_enqueue(struct cmd_element *matched_element, struct vty *vty, wyatt->matched_element = matched_element; wyatt->vty = vty; wyatt->argc = argc; - wyatt->argv = XCALLOC(MTYPE_MARSHAL, sizeof (char*) * argc); + wyatt->argv = argc ? XCALLOC(MTYPE_MARSHAL, sizeof (char*) * argc) : NULL; for (i = 0; i < argc; ++i) { wyatt->argv[i] = XSTRDUP(MTYPE_MARSHAL, argv[i]); @@ -80,7 +80,8 @@ cq_action(mqueue_block mqb) { XFREE(MTYPE_MARSHAL, wyatt->argv[i]); } - XFREE(MTYPE_MARSHAL, wyatt->argv); + if (wyatt->argv) + XFREE(MTYPE_MARSHAL, wyatt->argv); XFREE(MTYPE_MARSHAL, wyatt); mqb_free(mqb); } -- cgit v1.2.3