qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 19:37:43 +02:00
Code

[package] iwinfo: fix segmentation fault when doing two consecutive scans through wpa_supplicant

Browse Source 
Based on patch by Christian Kapeller <christian.kapeller@cmotion.eu> with one minor whitespace change
and updated package version.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29992 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2012-02-02 14:06:16 +00:00
parent 75d051e29d
commit 6b3fc26e43
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 include $(TOPDIR)/rules.mk
PKG_NAME:=libiwinfo PKG_NAME:=libiwinfo
PKG_RELEASE:=23 PKG_RELEASE:=24
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_CONFIG_DEPENDS := \ 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; goto out;
send(sock, "ATTACH", 6, 0); if (event)
{
send(sock, "ATTACH", 6, 0);
if (nl80211_wpactl_recv(sock, buffer, sizeof(buffer)) <= 0) if (nl80211_wpactl_recv(sock, buffer, sizeof(buffer)) <= 0)
goto out; goto out;
}
send(sock, cmd, strlen(cmd), 0); send(sock, cmd, strlen(cmd), 0);
@ -405,7 +408,7 @@ static char * nl80211_wpactl_info(const char *ifname, const char *cmd,
break; break;
} }
if ((!event && buffer[0] != '<') || strstr(buffer, event)) if ((!event && buffer[0] != '<') || (event && strstr(buffer, event)))
break; break;
} }