osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

packet-ieee80211.c: Use dynamic memory for AIRPDCAP_KEYS_COLLECTION 

Makes Windows vscodeanalysis a little happier.

Change-Id: I4e49615bc8b1623f826e0f2b9319d71016454310
Reviewed-on: https://code.wireshark.org/review/20725
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2017-03-26 14:07:12 -04:00
parent ebc6dfa6de
commit 505c0f375d
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
epan/dissectors/packet-ieee80211.c
View File

@ -19375,11 +19375,11 @@ try_decrypt(tvbuff_t *tvb, packet_info *pinfo, guint offset, guint len, guint8 *
static void
set_airpdcap_keys(void)
{
AIRPDCAP_KEYS_COLLECTION keys;
guint i;
AIRPDCAP_KEYS_COLLECTION *keys = g_new(AIRPDCAP_KEYS_COLLECTION, 1);
GByteArray *bytes = NULL;
guint i;
keys.nKeys = 0;
keys->nKeys = 0;
for (i = 0; (uat_wep_key_records != NULL) && (i < num_wepkeys_uat) && (i < MAX_ENCRYPTION_KEYS); i++)
{
@ -19406,8 +19406,8 @@ set_airpdcap_keys(void)
*/
memcpy(key.KeyData.Wep.WepKey, bytes->data, bytes->len);
key.KeyData.Wep.WepKeyLen = bytes->len;
keys.Keys[keys.nKeys] = key;
keys.nKeys += 1;
keys->Keys[keys->nKeys] = key;
keys->nKeys += 1;
}
}
else if (dk->type == AIRPDCAP_KEY_TYPE_WPA_PWD)
@ -19425,8 +19425,8 @@ set_airpdcap_keys(void)
key.UserPwd.SsidLen = dk->ssid->len;
}
keys.Keys[keys.nKeys] = key;
keys.nKeys += 1;
keys->Keys[keys->nKeys] = key;
keys->nKeys += 1;
}
else if (dk->type == AIRPDCAP_KEY_TYPE_WPA_PSK)
{
@ -19439,8 +19439,8 @@ set_airpdcap_keys(void)
if (bytes->len <= AIRPDCAP_WPA_PSK_LEN) {
memcpy(key.KeyData.Wpa.Psk, bytes->data, bytes->len);
keys.Keys[keys.nKeys] = key;
keys.nKeys += 1;
keys->Keys[keys->nKeys] = key;
keys->nKeys += 1;
}
}
free_key_string(dk);
@ -19452,8 +19452,8 @@ set_airpdcap_keys(void)
}
/* Now set the keys */
AirPDcapSetKeys(&airpdcap_ctx, keys.Keys, keys.nKeys);
AirPDcapSetKeys(&airpdcap_ctx, keys->Keys, keys->nKeys);
g_free(keys);
}
static void