1 --- src/drivers/driver_ndis.c.orig 2019-08-07 13:25:25 UTC 2 +++ src/drivers/driver_ndis.c 3 @@ -504,13 +504,13 @@ static int ndis_get_oid(struct wpa_drive 4 o->Length = len; 5 6 if (!PacketRequest(drv->adapter, FALSE, o)) { 7 - wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%d) failed", 8 + wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%lu) failed", 9 __func__, oid, len); 10 os_free(buf); 11 return -1; 12 } 13 if (o->Length > len) { 14 - wpa_printf(MSG_DEBUG, "%s: oid=0x%x Length (%d) > len (%d)", 15 + wpa_printf(MSG_DEBUG, "%s: oid=0x%x Length (%d) > len (%lu)", 16 __func__, oid, (unsigned int) o->Length, len); 17 os_free(buf); 18 return -1; 19 @@ -573,7 +573,7 @@ static int ndis_set_oid(struct wpa_drive 20 os_memcpy(o->Data, data, len); 21 22 if (!PacketRequest(drv->adapter, TRUE, o)) { 23 - wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%d) failed", 24 + wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%lu) failed", 25 __func__, oid, len); 26 os_free(buf); 27 return -1; 28 @@ -1531,7 +1531,7 @@ static void wpa_driver_ndis_event_auth(s 29 30 if (data_len < sizeof(*req)) { 31 wpa_printf(MSG_DEBUG, "NDIS: Too short Authentication Request " 32 - "Event (len=%d)", data_len); 33 + "Event (len=%lu)", data_len); 34 return; 35 } 36 req = (NDIS_802_11_AUTHENTICATION_REQUEST *) data; 37 @@ -1565,7 +1565,7 @@ static void wpa_driver_ndis_event_pmkid( 38 39 if (data_len < 8) { 40 wpa_printf(MSG_DEBUG, "NDIS: Too short PMKID Candidate List " 41 - "Event (len=%d)", data_len); 42 + "Event (len=%lu)", data_len); 43 return; 44 } 45 pmkid = (NDIS_802_11_PMKID_CANDIDATE_LIST *) data; 46 @@ -1587,7 +1587,7 @@ static void wpa_driver_ndis_event_pmkid( 47 os_memset(&event, 0, sizeof(event)); 48 for (i = 0; i < pmkid->NumCandidates; i++) { 49 PMKID_CANDIDATE *p = &pmkid->CandidateList[i]; 50 - wpa_printf(MSG_DEBUG, "NDIS: %d: " MACSTR " Flags 0x%x", 51 + wpa_printf(MSG_DEBUG, "NDIS: %lu: " MACSTR " Flags 0x%x", 52 i, MAC2STR(p->BSSID), (int) p->Flags); 53 os_memcpy(event.pmkid_candidate.bssid, p->BSSID, ETH_ALEN); 54 event.pmkid_candidate.index = i; 55 @@ -1778,7 +1778,7 @@ static void wpa_driver_ndis_get_capabili 56 "overflow"); 57 break; 58 } 59 - wpa_printf(MSG_MSGDUMP, "NDIS: %d - auth %d encr %d", 60 + wpa_printf(MSG_MSGDUMP, "NDIS: %lu - auth %d encr %d", 61 i, (int) ae->AuthModeSupported, 62 (int) ae->EncryptStatusSupported); 63 switch (ae->AuthModeSupported) { 64 @@ -2106,7 +2106,11 @@ static int wpa_driver_ndis_get_names(str 65 dlen = dpos - desc; 66 else 67 dlen = os_strlen(desc); 68 - drv->adapter_desc = dup_binstr(desc, dlen); 69 + drv->adapter_desc = os_malloc(dlen + 1); 70 + if (drv->adapter_desc) { 71 + os_memcpy(drv->adapter_desc, desc, dlen); 72 + drv->adapter_desc[dlen] = '\0'; 73 + } 74 os_free(b); 75 if (drv->adapter_desc == NULL) 76 return -1; 77 @@ -2274,7 +2278,11 @@ static int wpa_driver_ndis_get_names(str 78 } else { 79 dlen = os_strlen(desc[i]); 80 } 81 - drv->adapter_desc = dup_binstr(desc[i], dlen); 82 + drv->adapter_desc = os_malloc(dlen + 1); 83 + if (drv->adapter_desc) { 84 + os_memcpy(drv->adapter_desc, desc[i], dlen); 85 + drv->adapter_desc[dlen] = '\0'; 86 + } 87 os_free(names); 88 if (drv->adapter_desc == NULL) 89 return -1; 90