From: Ben Kelly <ben@benjii.net>
Date: Mon, 20 Feb 2017 12:04:30 +0000 (+0200)
Subject: swconfig: Bugfix switch_port uci option parsing
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=df9e7b1b269f4bd617cd8eb1b8f8a0d9ecb57160;p=openwrt%2Fstaging%2Fblocktrron.git

swconfig: Bugfix switch_port uci option parsing

When not defining 'device' or 'vlan' in relevant switch_port uci
sections, behaviour is inconsistent due to *devn, *port and *vlan
pointers not being zero initialized.

Signed-off-by: Ben Kelly <ben@benjii.net>
---

diff --git a/package/network/config/swconfig/src/uci.c b/package/network/config/swconfig/src/uci.c
index b541b71646..bf76bd3de1 100644
--- a/package/network/config/swconfig/src/uci.c
+++ b/package/network/config/swconfig/src/uci.c
@@ -165,7 +165,7 @@ found:
 		s = uci_to_section(e);
 
 		if (!strcmp(s->type, "switch_port")) {
-			char *devn, *port, *port_err = NULL;
+			char *devn = NULL, *port = NULL, *port_err = NULL;
 			int port_n;
 
 			uci_foreach_element(&s->options, os) {
@@ -190,7 +190,7 @@ found:
 
 			swlib_map_settings(dev, SWLIB_ATTR_GROUP_PORT, port_n, s);
 		} else if (!strcmp(s->type, "switch_vlan")) {
-			char *devn, *vlan, *vlan_err = NULL;
+			char *devn = NULL, *vlan = NULL, *vlan_err = NULL;
 			int vlan_n;
 
 			uci_foreach_element(&s->options, os) {