summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Jakma <paul.jakma@sun.com>2006-05-15 10:56:46 +0000
committerPaul Jakma <paul.jakma@sun.com>2006-05-15 10:56:46 +0000
commitd16e04335968ea05fda60cec01b48df8c345a8ce (patch)
tree9ae64651811fa1dfbaba9dc4d114c0a72ace2a55
parent0b26f81bf9e81be0f65787c48061709427c70d10 (diff)
[lib] CID #39, Fix the vty completion leak-fix to only free when desired
2006-05-13 Paul Jakma <paul.jakma@sun.com> * vty.c: (vty_describe_command) CID #39 fix was too hasty, just cause it /can/ leak doesn't mean it always will have, check first.
-rw-r--r--lib/ChangeLog6
-rw-r--r--lib/vty.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog
index f5cee80b..7d3eb677 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-13 Paul Jakma <paul.jakma@sun.com>
+
+ * vty.c: (vty_describe_command) CID #39 fix was too hasty, just
+ cause it /can/ leak doesn't mean it always will have, check
+ first.
+
2006-05-12 Paul Jakma <paul.jakma@sun.com>
* plist.c: (vty_prefix_list_uninstall) Fix potential NULL deref
diff --git a/lib/vty.c b/lib/vty.c
index 98f6494e..7696915a 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -1062,7 +1062,8 @@ vty_describe_command (struct vty *vty)
out:
cmd_free_strvec (vline);
- vector_free (describe);
+ if (describe)
+ vector_free (describe);
vty_prompt (vty);
vty_redraw_line (vty);