summaryrefslogtreecommitdiff
path: root/wireless.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-10-24 15:00:12 +0200
committerFelix Fietkau <nbd@openwrt.org>2014-10-24 15:03:20 +0200
commitb46a8f3b9794efed197ffd2f6f62eb946de5f235 (patch)
tree06591201e8f9148c61d6f86f09ec1bb99c7a1a82 /wireless.c
parent9af0e57ce2c76db2ce49ea9fbfb5766da6000ec6 (diff)
downloadnetifd-b46a8f3b9794efed197ffd2f6f62eb946de5f235.tar.gz
wireless: use strdup for vif sections
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Diffstat (limited to 'wireless.c')
-rw-r--r--wireless.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/wireless.c b/wireless.c
index c9443bd..8bdfc4b 100644
--- a/wireless.c
+++ b/wireless.c
@@ -544,7 +544,8 @@ vif_update(struct vlist_tree *tree, struct vlist_node *node_new,
wdev = vif_new->wdev;
if (vif_old && vif_new) {
- vif_old->section = vif_new->section;
+ free((void *) vif_old->section);
+ vif_old->section = strdup(vif_new->section);
if (blob_attr_equal(vif_old->config, vif_new->config)) {
free(vif_new);
return;
@@ -557,10 +558,12 @@ vif_update(struct vlist_tree *tree, struct vlist_node *node_new,
free(vif_new);
} else if (vif_new) {
D(WIRELESS, "Create new wireless interface %s on device %s\n", vif_new->name, wdev->name);
+ vif_new->section = strdup(vif_new->section);
vif_new->config = blob_memdup(vif_new->config);
wireless_interface_init_config(vif_new);
} else if (vif_old) {
D(WIRELESS, "Delete wireless interface %s on device %s\n", vif_old->name, wdev->name);
+ free((void *) vif_old->section);
free(vif_old->config);
free(vif_old);
}
@@ -660,7 +663,7 @@ void wireless_interface_create(struct wireless_device *wdev, struct blob_attr *d
struct wireless_interface *vif;
struct blob_attr *tb[__VIF_ATTR_MAX];
struct blob_attr *cur;
- char *name_buf, *section_buf;
+ char *name_buf;
char name[8];
blobmsg_parse(vif_policy, __VIF_ATTR_MAX, tb, blob_data(data), blob_len(data));
@@ -672,12 +675,11 @@ void wireless_interface_create(struct wireless_device *wdev, struct blob_attr *d
sprintf(name, "%d", wdev->vif_idx++);
vif = calloc_a(sizeof(*vif),
- &name_buf, strlen(name) + 1,
- &section_buf, strlen(section) + 1);
+ &name_buf, strlen(name) + 1);
vif->name = strcpy(name_buf, name);
vif->wdev = wdev;
vif->config = data;
- vif->section = strcpy(section_buf, section);
+ vif->section = section;
vlist_add(&wdev->interfaces, &vif->node, vif->name);
}