From 2fe8aba3a09b3e2a64ee1861d8eeb389efaf1eb0 Mon Sep 17 00:00:00 2001 From: Paul Jakma Date: Fri, 12 May 2006 23:22:01 +0000 Subject: [lib] CID #39, fix leak in error path, vty_describe_command 2006-05-12 Paul Jakma * vty.c: (vty_describe_command) fix leak of describe vector in error path, CID #39. --- lib/ChangeLog | 2 ++ lib/vty.c | 11 +++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index dc9999b3..46727473 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -4,6 +4,8 @@ of prefix and typestr strings, Coverity CID #3. * command.c: (cmd_complete_command_real) Fix leak of cmd_vector in error case, Coverity CID #37. + * vty.c: (vty_describe_command) fix leak of describe vector in + error path, CID #39. 2006-03-30 Paul Jakma diff --git a/lib/vty.c b/lib/vty.c index 206af065..98f6494e 100644 --- a/lib/vty.c +++ b/lib/vty.c @@ -985,18 +985,12 @@ vty_describe_command (struct vty *vty) switch (ret) { case CMD_ERR_AMBIGUOUS: - cmd_free_strvec (vline); vty_out (vty, "%% Ambiguous command.%s", VTY_NEWLINE); - vty_prompt (vty); - vty_redraw_line (vty); - return; + goto out; break; case CMD_ERR_NO_MATCH: - cmd_free_strvec (vline); vty_out (vty, "%% There is no matched command.%s", VTY_NEWLINE); - vty_prompt (vty); - vty_redraw_line (vty); - return; + goto out; break; } @@ -1066,6 +1060,7 @@ vty_describe_command (struct vty *vty) vty_describe_fold (vty, width, desc_width, desc); } +out: cmd_free_strvec (vline); vector_free (describe); -- cgit v1.2.1