From 9376c3421ae9ccc37e51ed742c5d0bed333f8d20 Mon Sep 17 00:00:00 2001 From: Paul Jakma Date: Fri, 12 May 2006 23:17:38 +0000 Subject: [lib] CID #3, fix forward-null errors in vty_prefix_list_uninstall 2006-05-12 Paul Jakma * plist.c: (vty_prefix_list_uninstall) Fix potential NULL deref of prefix and typestr strings, Coverity CID #3. --- lib/plist.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/plist.c') diff --git a/lib/plist.c b/lib/plist.c index 83c5aa0c..6caece0e 100644 --- a/lib/plist.c +++ b/lib/plist.c @@ -804,6 +804,13 @@ vty_prefix_list_uninstall (struct vty *vty, afi_t afi, const char *name, return CMD_SUCCESS; } + /* We must have, at a minimum, both the type and prefix here */ + if ((typestr == NULL) || (prefix == NULL)) + { + vty_out (vty, "%% Both prefix and type required%s", VTY_NEWLINE); + return CMD_WARNING; + } + /* Check sequence number. */ if (seq) seqnum = atoi (seq); -- cgit v1.2.3 From 30a2231a4881f53deca61ef7a62b225a43dab4c5 Mon Sep 17 00:00:00 2001 From: Paul Jakma Date: Fri, 15 Aug 2008 14:05:22 +0100 Subject: [warnings] Fix various SOS warnings 2008-08-15 Paul Jakma * */*: Fix various problems flagged by Sun Studio compiler. - ' ' obsolescent in declarations - empty statements (';' after ALIAS definitions) - implicit declarations (e.g printstack in lib/log.c) - "\%" in printf string instead of "%%" - loops that return on the first iteration (legitimately, but compiler can't really know), e.g. bgp_routemap.c - internal declarations which mask prototypes. --- lib/plist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plist.c') diff --git a/lib/plist.c b/lib/plist.c index 6caece0e..4b498c4d 100644 --- a/lib/plist.c +++ b/lib/plist.c @@ -518,7 +518,7 @@ prefix_list_entry_add (struct prefix_list *plist, } /* Return string of prefix_list_type. */ -const static char * +static const char * prefix_list_type_str (struct prefix_list_entry *pentry) { switch (pentry->type) -- cgit v1.2.3