KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

iwinfo: fix segmentation fault when doing two consecutive scans through wpa_supplicant Based on patch by Christian Kapeller <christian.kapeller@cmotion.eu> with one minor whitespace change and updated package version.

Browse source 
SVN-Revision: 29992
This commit is contained in:
Jo-Philipp Wich 2012-02-02 14:06:16 +00:00
parent eca9950f63
commit 33e4461db6
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/iwinfo/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libiwinfo
PKG_RELEASE:=23
PKG_RELEASE:=24
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_CONFIG_DEPENDS := \

11
package/iwinfo/src/iwinfo_nl80211.c
View file

@ -387,10 +387,13 @@ static char * nl80211_wpactl_info(const char *ifname, const char *cmd,
goto out;
send(sock, "ATTACH", 6, 0);
if (event)
{
send(sock, "ATTACH", 6, 0);
if (nl80211_wpactl_recv(sock, buffer, sizeof(buffer)) <= 0)
goto out;
if (nl80211_wpactl_recv(sock, buffer, sizeof(buffer)) <= 0)
goto out;
}
send(sock, cmd, strlen(cmd), 0);
@ -405,7 +408,7 @@ static char * nl80211_wpactl_info(const char *ifname, const char *cmd,
break;
}
if ((!event && buffer[0] != '<') || strstr(buffer, event))
if ((!event && buffer[0] != '<') || (event && strstr(buffer, event)))
break;
}