]> git.ipfire.org Git - thirdparty/iw.git/commitdiff
fix frequency parsing
authorJohannes Berg <johannes.berg@intel.com>
Wed, 2 Mar 2011 13:45:32 +0000 (14:45 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 2 Mar 2011 13:45:32 +0000 (14:45 +0100)
scan.c

diff --git a/scan.c b/scan.c
index 486a70e44bdc4608d50d91986a9977c93b98080f..76ef788fb67931b1d0bd6f635d00ba74356e4c07 100644 (file)
--- a/scan.c
+++ b/scan.c
@@ -105,10 +105,13 @@ static int handle_scan(struct nl80211_state *state,
                        return 1;
                case FREQ:
                        freq = strtoul(argv[i], &eptr, 10);
-                       if (eptr != argv[i] + strlen(argv[i]))
-                               return 1;
+                       if (eptr != argv[i] + strlen(argv[i])) {
+                               /* failed to parse as number -- maybe a tag? */
+                               i--;
+                               parse = NONE;
+                               continue;
+                       }
                        NLA_PUT_U32(freqs, i, freq);
-                       parse = NONE;
                        break;
                case IES:
                        ies = parse_hex(argv[i], &tmp);