diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-08-21 16:50:15 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-09-23 03:00:27 +0000 |
| commit | 68dbc6431f5b391c05f27641ad5c11c378739648 (patch) | |
| tree | 38f333e7d076aa5ed67026c670b6d3e8ee712216 /epan/dissectors/packet-isakmp.c | |
| parent | a2329b187b640d39d8dbd93cfe21eeeb954d82fa (diff) | |
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>
Diffstat (limited to 'epan/dissectors/packet-isakmp.c')
| -rw-r--r-- | epan/dissectors/packet-isakmp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 91e0f4b169..0750a4210c 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -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 */ |