[PATCH iproute2 net-next] bridge: print_vlan: add missing check for json instance
From: Roopa Prabhu <hidden>
Date: 2016-08-03 06:15:37
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Roopa Prabhu <redacted>
Also initialize vlan_flags
Fixes: d82a49ce85f0 ("bridge: add json support for bridge vlan show")
Signed-off-by: Roopa Prabhu <redacted>
---
bridge/vlan.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bridge/vlan.c b/bridge/vlan.c
index f262cc7..22f32a5 100644
--- a/bridge/vlan.c
+++ b/bridge/vlan.c@@ -188,7 +188,7 @@ static int print_vlan(const struct sockaddr_nl *who, struct ifinfomsg *ifm = NLMSG_DATA(n); int len = n->nlmsg_len; struct rtattr *tb[IFLA_MAX+1]; - bool vlan_flags; + bool vlan_flags = false; if (n->nlmsg_type != RTM_NEWLINK) { fprintf(stderr, "Not RTM_NEWLINK: %08x %08x %08x\n",
@@ -276,7 +276,7 @@ static int print_vlan(const struct sockaddr_nl *who, fprintf(fp, " Egress Untagged"); } } - if (vlan_flags) { + if (jw_global && vlan_flags) { jsonw_end_array(jw_global); vlan_flags = false; }
--
2.1.4