ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-21 09:42:09 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

swconfig: Bugfix switch_port uci option parsing

Browse Source 
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>
This commit is contained in:
Ben Kelly 2017-02-20 14:04:30 +02:00 committed by Felix Fietkau
parent 43b6d3f059
commit df9e7b1b26
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/network/config/swconfig/src/uci.c
View File

@ -165,7 +165,7 @@ found:
s = uci_to_section(e); s = uci_to_section(e);
if (!strcmp(s->type, "switch_port")) { if (!strcmp(s->type, "switch_port")) {
char *devn, *port, *port_err = NULL; char *devn = NULL, *port = NULL, *port_err = NULL;
int port_n; int port_n;
uci_foreach_element(&s->options, os) { uci_foreach_element(&s->options, os) {
@ -190,7 +190,7 @@ found:
swlib_map_settings(dev, SWLIB_ATTR_GROUP_PORT, port_n, s); swlib_map_settings(dev, SWLIB_ATTR_GROUP_PORT, port_n, s);
} else if (!strcmp(s->type, "switch_vlan")) { } else if (!strcmp(s->type, "switch_vlan")) {
char *devn, *vlan, *vlan_err = NULL; char *devn = NULL, *vlan = NULL, *vlan_err = NULL;
int vlan_n; int vlan_n;
uci_foreach_element(&s->options, os) { uci_foreach_element(&s->options, os) {