]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
D-Bus: Use size_t for values theoretically larger than 16-bit int
authorJouni Malinen <j@w1.fi>
Sun, 22 Mar 2020 15:24:21 +0000 (17:24 +0200)
committerJouni Malinen <j@w1.fi>
Sun, 22 Mar 2020 16:50:04 +0000 (18:50 +0200)
These are theoretical cases with 32-bit integers, but cases that could
potentially hit an integer overflow with 16-bit int.

Signed-off-by: Jouni Malinen <j@w1.fi>
wpa_supplicant/dbus/dbus_new_handlers.c

index c842c50e9fbfaf96e97d3da807401b957f8dbd67..01fc67b6f2b2fe11f83820975dbc30df0262699f 100644 (file)
@@ -1146,7 +1146,7 @@ static int wpas_dbus_get_scan_ies(DBusMessage *message, DBusMessageIter *var,
                                  DBusMessage **reply)
 {
        u8 *ies = NULL, *nies;
-       int ies_len = 0;
+       size_t ies_len = 0;
        DBusMessageIter array_iter, sub_array_iter;
        char *val;
        int len;
@@ -1177,7 +1177,7 @@ static int wpas_dbus_get_scan_ies(DBusMessage *message, DBusMessageIter *var,
                dbus_message_iter_recurse(&array_iter, &sub_array_iter);
 
                dbus_message_iter_get_fixed_array(&sub_array_iter, &val, &len);
-               if (len == 0) {
+               if (len <= 0) {
                        dbus_message_iter_next(&array_iter);
                        continue;
                }
@@ -1208,7 +1208,7 @@ static int wpas_dbus_get_scan_channels(DBusMessage *message,
 {
        DBusMessageIter array_iter, sub_array_iter;
        int *freqs = NULL, *nfreqs;
-       int freqs_num = 0;
+       size_t freqs_num = 0;
 
        if (dbus_message_iter_get_arg_type(var) != DBUS_TYPE_ARRAY) {
                wpa_printf(MSG_DEBUG,