Changeset 6276

Timestamp:

10/12/10 02:49:20 (3 years ago)

Author:

jow

Message:

libiwinfo: fix two segfaults in nl80211 backend

Files:

• luci/trunk/contrib/package/iwinfo/src/iwinfo_nl80211.c (modified) (4 diffs)

luci/trunk/contrib/package/iwinfo/src/iwinfo_nl80211.c

@@ -137 +137 @@
     if( cv && cv->msg )
         nlmsg_free(cv->msg);
+
+    if( cv )
+    {
+        cv->cb  = NULL;
+        cv->msg = NULL;
+    }
 }
 
@@ -579 +585 @@
 int nl80211_get_noise(const char *ifname, int *buf)
 {
+    int rv = -1;
     struct nl80211_msg_conveyor *req, *res;
     struct nlattr *si[NL80211_SURVEY_INFO_MAX + 1];
@@ -596 +603 @@
             {
                 if( !nla_parse_nested(si, NL80211_SURVEY_INFO_MAX,
-                        res->attr[NL80211_ATTR_SURVEY_INFO], sp) )
+                        res->attr[NL80211_ATTR_SURVEY_INFO], sp) &&
+                    si[NL80211_SURVEY_INFO_NOISE] )
                 {
                     *buf = (int8_t)nla_get_u8(si[NL80211_SURVEY_INFO_NOISE]);
-                    return 0;
+                    rv = 0;
                 }
             }
@@ -607 +615 @@
     }
 
-    return -1;
+    return rv;
 }