]> git.ipfire.org Git - thirdparty/iw.git/commitdiff
print invalid tail on WPA/RSN IE if present
authorJohannes Berg <johannes@sipsolutions.net>
Mon, 4 May 2009 16:57:03 +0000 (18:57 +0200)
committerJohannes Berg <johannes@sipsolutions.net>
Mon, 4 May 2009 16:57:03 +0000 (18:57 +0200)
scan.c

diff --git a/scan.c b/scan.c
index 9698f9fcd59065174c01cbe0a64ba52e553e2350..db7de83de6166ec695b4c68b7edb55e027265104 100644 (file)
--- a/scan.c
+++ b/scan.c
@@ -352,15 +352,14 @@ static void print_rsn_ie(const char *defcipher, const char *defauth,
        data += 2 + (count * 4);
        len -= 2 + (count * 4);
 
-       if (len < 2)
-               return;
-
-       capa = data[0] | (data[1] << 8);
-       tab_on_first(&first);
-       printf("\t * Capabilities: 0x%.4x\n", capa);
+       if (len >= 2) {
+               capa = data[0] | (data[1] << 8);
+               tab_on_first(&first);
+               printf("\t * Capabilities: 0x%.4x\n", capa);
 
-       data += 2;
-       len -= 2;
+               data += 2;
+               len -= 2;
+       }
 
 invalid:
        if (len != 0) {