diff --git a/bgpd/bgp_ecommunity.c b/bgpd/bgp_ecommunity.c
index 85b9ffd8ca..99fe80f055 100644
--- a/bgpd/bgp_ecommunity.c
+++ b/bgpd/bgp_ecommunity.c
@@ -52,6 +52,11 @@ struct ecommunity *ecommunity_new(void)
 					    sizeof(struct ecommunity));
 }
 
+void ecommunity_strfree(char **s)
+{
+	XFREE(MTYPE_ECOMMUNITY_STR, *s);
+}
+
 /* Allocate ecommunities.  */
 void ecommunity_free(struct ecommunity **ecom)
 {
diff --git a/bgpd/bgp_ecommunity.h b/bgpd/bgp_ecommunity.h
index 88bdb5e2ae..2f59308d65 100644
--- a/bgpd/bgp_ecommunity.h
+++ b/bgpd/bgp_ecommunity.h
@@ -156,6 +156,7 @@ extern void ecommunity_unintern(struct ecommunity **);
 extern unsigned int ecommunity_hash_make(void *);
 extern struct ecommunity *ecommunity_str2com(const char *, int, int);
 extern char *ecommunity_ecom2str(struct ecommunity *, int, int);
+extern void ecommunity_strfree(char **s);
 extern int ecommunity_match(const struct ecommunity *,
 			    const struct ecommunity *);
 extern char *ecommunity_str(struct ecommunity *);
diff --git a/bgpd/bgp_flowspec.c b/bgpd/bgp_flowspec.c
index 5db7e37089..6eb1e39884 100644
--- a/bgpd/bgp_flowspec.c
+++ b/bgpd/bgp_flowspec.c
@@ -166,6 +166,9 @@ int bgp_nlri_parse_flowspec(struct peer *peer, struct attr *attr,
 					 BGP_FLOWSPEC_NLRI_STRING_MAX,
 					 "EC{%s}",
 					s == NULL ? "none" : s);
+
+				if (s)
+					ecommunity_strfree(&s);
 			}
 			snprintf(local_string, BGP_FLOWSPEC_NLRI_STRING_MAX,
 				 "FS Rx %s %s %s %s", withdraw ?
diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index 55365df299..bcc448119c 100644
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -565,10 +565,11 @@ leak_update(
 	if (nexthop_self_flag)
 		bgp_info_set_flag(bn, new, BGP_INFO_ANNC_NH_SELF);
 
+	bgp_info_extra_get(new);
+
 	if (num_labels)
 		setlabels(new, label, num_labels);
 
-	bgp_info_extra_get(new);
 	new->extra->parent = bgp_info_lock(parent);
 
 	if (bgp_orig)
@@ -582,7 +583,7 @@ leak_update(
 	struct bgp *bgp_nexthop = bgp;
 	int nh_valid;
 
-	if (new->extra && new->extra->bgp_orig)
+	if (new->extra->bgp_orig)
 		bgp_nexthop = new->extra->bgp_orig;
 
 	/*
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 9fff2ee58c..4974e538ea 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -341,6 +341,7 @@ static int vtysh_execute_func(const char *line, int pager)
 
 	if (user_mode) {
 		if (strncmp("en", vector_slot(vline, 0), 2) == 0) {
+			cmd_free_strvec(vline);
 			fprintf(stdout, "%% Command not allowed: enable\n");
 			return CMD_WARNING;
 		}