From: Johannes Berg <johannes@sipsolutions.net>
Date: Mon, 4 May 2009 16:57:03 +0000 (+0200)
Subject: print invalid tail on WPA/RSN IE if present
X-Git-Tag: v0.9.14~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a4f24e80e5e6d85bfd1c4d66b476b86e5fa35d3;p=thirdparty%2Fiw.git

print invalid tail on WPA/RSN IE if present
---

diff --git a/scan.c b/scan.c
index 9698f9f..db7de83 100644
--- 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) {