diff options
| author | Ben Kelly <ben@benjii.net> | 2017-02-20 14:04:30 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2017-03-01 20:37:37 +0100 |
| commit | 3d52251df42c810e84c712f8dded2fe3af44f7e6 (patch) | |
| tree | ce68b88c6db8595ab763892c3f4c6f36f62e35fd | |
| parent | df041b65200cc4c9d989164de51f9c058e8d272f (diff) | |
| download | upstream-3d52251df42c810e84c712f8dded2fe3af44f7e6.tar.gz upstream-3d52251df42c810e84c712f8dded2fe3af44f7e6.tar.bz2 upstream-3d52251df42c810e84c712f8dded2fe3af44f7e6.zip | |
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>
| -rw-r--r-- | package/network/config/swconfig/src/uci.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |