osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

ISAKMP: fix Argument with 'nonnull' attribute passed null found by Clang Analyzer 

Change-Id: I8d7ebc6dd46e0d6494d412653ec423b8c0fde9c8
Reviewed-on: https://code.wireshark.org/review/17203
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Alexis La Goutte 2016-08-21 16:50:15 +02:00 committed by Michael Mann
parent a2329b187b
commit 68dbc6431f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-isakmp.c
View File

@ -5323,7 +5323,9 @@ dissect_enc(tvbuff_t *tvb,
encr_iv = (guchar *)wmem_alloc0(wmem_packet_scope(), encr_iv_len);
memcpy( encr_iv + encr_iv_offset, key_info->encr_key + encr_key_len, key_info->encr_spec->salt_len );
memcpy( encr_iv + encr_iv_offset + key_info->encr_spec->salt_len, iv, iv_len );
if(iv) {
memcpy( encr_iv + encr_iv_offset + key_info->encr_spec->salt_len, iv, iv_len );
}
if (key_info->encr_spec->gcry_mode == GCRY_CIPHER_MODE_CTR) {
encr_iv[encr_iv_len-1] = 1;
/* fallback for gcrypt not having AEAD ciphers */