aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-isakmp.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-isakmp.c')
-rw-r--r--epan/dissectors/packet-isakmp.c4
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 */