wpa_supplicant: Set Ver 0.8.X as default

[android-x86/external-wpa_supplicant_8.git] / src / ap / hw_features.c

diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
index 76c4211..97e1238 100644 (file)
--- a/src/ap/hw_features.c
+++ b/src/ap/hw_features.c
@@ -129,6 +129,8 @@ int hostapd_prepare_rates(struct hostapd_iface *iface,
        i = 0;
        while (basic_rates[i] >= 0)
                i++;
+       if (i)
+               i++; /* -1 termination */
        os_free(iface->basic_rates);
        iface->basic_rates = os_malloc(i * sizeof(int));
        if (iface->basic_rates)
@@ -138,7 +140,7 @@ int hostapd_prepare_rates(struct hostapd_iface *iface,
        iface->num_rates = 0;
 
        iface->current_rates =
-               os_zalloc(mode->num_rates * sizeof(struct hostapd_rate_data));
+               os_calloc(mode->num_rates, sizeof(struct hostapd_rate_data));
        if (!iface->current_rates) {
                wpa_printf(MSG_ERROR, "Failed to allocate memory for rate "
                           "table.");
@@ -470,7 +472,7 @@ static void ieee80211n_scan_channels_2g4(struct hostapd_iface *iface,
                   affected_start, affected_end);
 
        mode = iface->current_mode;
-       params->freqs = os_zalloc((mode->num_channels + 1) * sizeof(int));
+       params->freqs = os_calloc(mode->num_channels + 1, sizeof(int));
        if (params->freqs == NULL)
                return;
        pos = 0;