diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2012-09-13 10:39:48 -0700 |
---|---|---|
committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-09-13 10:39:48 -0700 |
commit | 07f427a83c1bd048f8c4b6515d45f81e96877e37 (patch) | |
tree | c91b6eaf3839a25aa6cc553d5efe2695509b3a07 /wpa_supplicant/ctrl_iface_unix.c | |
parent | f4f5db315918f3f048324ea43dc37a3b0fb31ecc (diff) | |
download | external_wpa_supplicant_8-07f427a83c1bd048f8c4b6515d45f81e96877e37.zip external_wpa_supplicant_8-07f427a83c1bd048f8c4b6515d45f81e96877e37.tar.gz external_wpa_supplicant_8-07f427a83c1bd048f8c4b6515d45f81e96877e37.tar.bz2 |
wpa_supplicant: Fix P2P command processing
Change-Id: Ib2e811513be7b05178e310040f7cae14cb425421
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wpa_supplicant/ctrl_iface_unix.c')
-rw-r--r-- | wpa_supplicant/ctrl_iface_unix.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/wpa_supplicant/ctrl_iface_unix.c b/wpa_supplicant/ctrl_iface_unix.c index 5d81b43..80db27e 100644 --- a/wpa_supplicant/ctrl_iface_unix.c +++ b/wpa_supplicant/ctrl_iface_unix.c @@ -175,7 +175,7 @@ static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx, if (ifend != NULL) *ifend++ = '\0'; else - ifend = ""; + *(ifname - 1) = '\0'; wpa_printf(MSG_DEBUG, "Found %s", ifname); for (wpa_s = wpa_s->global->ifaces; wpa_s; wpa_s = wpa_s->next) { if (os_strcmp(wpa_s->ifname, ifname + 10) == 0) @@ -185,8 +185,9 @@ static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx, wpa_printf(MSG_ERROR, "P2P: %s does not exist", ifname); wpa_s = eloop_ctx; } - os_memmove(ifname, ifend, strlen(ifend) + 1); - wpa_printf(MSG_INFO, "wpa_s %p cmd %s", wpa_s, buf); + if (ifend != NULL) + os_memmove(ifname, ifend, strlen(ifend) + 1); + wpa_printf(MSG_INFO, "wpa_s->ifname %s cmd %s", wpa_s ? wpa_s->ifname : "NULL", buf); } #endif /* defined CONFIG_P2P && defined ANDROID_P2P */ reply = wpa_supplicant_ctrl_iface_process(wpa_s, buf, |