Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2024-11-28 18:28:23 -05:00
Code Issues Projects Releases Wiki Activity

Remove unused gid_str pointer update

Browse Source 
The group name is not used on these paths, so just remove it from the
directory name without updating gid_str to point to the unused group
name.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-03-02 15:52:10 +02:00
parent 749fa140ff
commit 6ed626df40
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wpa_supplicant/ctrl_iface_unix.c
View File

@ -244,7 +244,7 @@ static char * wpa_supplicant_ctrl_iface_path(struct wpa_supplicant *wpa_s)
{ {
char *buf; char *buf;
size_t len; size_t len;
char *pbuf, *dir = NULL, *gid_str = NULL; char *pbuf, *dir = NULL;
int res; int res;
if (wpa_s->conf->ctrl_interface == NULL) if (wpa_s->conf->ctrl_interface == NULL)
@ -254,12 +254,11 @@ static char * wpa_supplicant_ctrl_iface_path(struct wpa_supplicant *wpa_s)
if (pbuf == NULL) if (pbuf == NULL)
return NULL; return NULL;
if (os_strncmp(pbuf, "DIR=", 4) == 0) { if (os_strncmp(pbuf, "DIR=", 4) == 0) {
char *gid_str;
dir = pbuf + 4; dir = pbuf + 4;
gid_str = os_strstr(dir, " GROUP="); gid_str = os_strstr(dir, " GROUP=");
if (gid_str) { if (gid_str)
*gid_str = '\0'; *gid_str = '\0';
gid_str += 7;
}
} else } else
dir = pbuf; dir = pbuf;
@ -573,7 +572,7 @@ void wpa_supplicant_ctrl_iface_deinit(struct ctrl_iface_priv *priv)
if (priv->sock > -1) { if (priv->sock > -1) {
char *fname; char *fname;
char *buf, *dir = NULL, *gid_str = NULL; char *buf, *dir = NULL;
eloop_unregister_read_sock(priv->sock); eloop_unregister_read_sock(priv->sock);
if (!dl_list_empty(&priv->ctrl_dst)) { if (!dl_list_empty(&priv->ctrl_dst)) {
/* /*
@ -599,12 +598,11 @@ void wpa_supplicant_ctrl_iface_deinit(struct ctrl_iface_priv *priv)
if (buf == NULL) if (buf == NULL)
goto free_dst; goto free_dst;
if (os_strncmp(buf, "DIR=", 4) == 0) { if (os_strncmp(buf, "DIR=", 4) == 0) {
char *gid_str;
dir = buf + 4; dir = buf + 4;
gid_str = os_strstr(dir, " GROUP="); gid_str = os_strstr(dir, " GROUP=");
if (gid_str) { if (gid_str)
*gid_str = '\0'; *gid_str = '\0';
gid_str += 7;
}
} else } else
dir = buf; dir = buf;