libiwinfo: fix nl80211_get_channel() and nl80211_get_frequency()

diff --git a/contrib/package/iwinfo/Makefile b/contrib/package/iwinfo/Makefile
index 7cad392586564d1f3c22881290171a8b495ab313..4651723f17c02ca452639c416c59f931bce3458c 100644 (file)
--- a/contrib/package/iwinfo/Makefile
+++ b/contrib/package/iwinfo/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libiwinfo
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 

diff --git a/contrib/package/iwinfo/src/iwinfo_nl80211.c b/contrib/package/iwinfo/src/iwinfo_nl80211.c
index 5d1add9689af96e119a5e9cc9475652773a3d22d..c039221a59a12f4113f66f728204561761072798 100644 (file)
--- a/contrib/package/iwinfo/src/iwinfo_nl80211.c
+++ b/contrib/package/iwinfo/src/iwinfo_nl80211.c
@@ -426,7 +426,9 @@ static char * nl80211_phy2ifname(const char *ifname)
        DIR *d;
        struct dirent *e;
 
-       if( !strncmp(ifname, "phy", 3) )
+       if( !ifname )
+               return NULL;
+       else if( !strncmp(ifname, "phy", 3) )
                phyidx = atoi(&ifname[3]);
        else if( !strncmp(ifname, "radio", 5) )
                phyidx = atoi(&ifname[5]);
@@ -604,11 +606,11 @@ int nl80211_get_channel(const char *ifname, int *buf)
 {
        char *first;
 
-       if( wext_get_channel(ifname, buf) &&
-           NULL != (first = nl80211_phy2ifname(nl80211_ifname2phy(ifname))) )
-       {
+       if( !wext_get_channel(ifname, buf) )
+               return 0;
+
+       else if( (first = nl80211_phy2ifname(nl80211_ifname2phy(ifname))) != NULL )
                return wext_get_channel(first, buf);
-       }
 
        return -1;
 }
@@ -617,11 +619,11 @@ int nl80211_get_frequency(const char *ifname, int *buf)
 {
        char *first;
 
-       if( wext_get_channel(ifname, buf) &&
-           NULL != (first = nl80211_phy2ifname(nl80211_ifname2phy(ifname))) )
-       {
+       if( !wext_get_frequency(ifname, buf) )
+               return 0;
+
+       else if( (first = nl80211_phy2ifname(nl80211_ifname2phy(ifname))) != NULL )
                return wext_get_frequency(first, buf);
-       }
 
        return -1;
 }