diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-01-05 21:06:51 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-01-05 21:06:51 -0800 |
| commit | cdb95a67b1e219426296f44c097aaf5120bc72fe (patch) | |
| tree | 734981545d8b59f6dd1334fb311f6a63668eca8b /src/p2p/p2p.c | |
| parent | ad6cecd573bb45283f016b11733706fb9bdc0b54 (diff) | |
| parent | 047069a6479c3d7eb5cf52fcbf2c8fd1143f931f (diff) | |
| download | android_external_wpa_supplicant_8-cdb95a67b1e219426296f44c097aaf5120bc72fe.tar.gz android_external_wpa_supplicant_8-cdb95a67b1e219426296f44c097aaf5120bc72fe.tar.bz2 android_external_wpa_supplicant_8-cdb95a67b1e219426296f44c097aaf5120bc72fe.zip | |
Merge "P2P: Filter control chars in group client device name similarly to peer" into wlan-service.lnx.1.0-dev.1.0
Diffstat (limited to 'src/p2p/p2p.c')
| -rw-r--r-- | src/p2p/p2p.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index b87ff96b..99bd402a 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -455,8 +455,9 @@ static struct p2p_device * p2p_create_device(struct p2p_data *p2p, static void p2p_copy_client_info(struct p2p_device *dev, struct p2p_client_info *cli) { - os_memcpy(dev->info.device_name, cli->dev_name, cli->dev_name_len); - dev->info.device_name[cli->dev_name_len] = '\0'; + p2p_copy_filter_devname(dev->info.device_name, + sizeof(dev->info.device_name), + cli->dev_name, cli->dev_name_len); dev->info.dev_capab = cli->dev_capab; dev->info.config_methods = cli->config_methods; os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8); |