diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2019-05-15 01:30:29 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2019-05-15 11:27:13 +0000 |
| commit | ab1a7cc4a5dc5435df50cc480d1f0ae8ad06ee65 (patch) | |
| tree | 66e29659ef756ab9001bb115e77937c9f0a2bfca /epan/dissectors/packet-dtls.c | |
| parent | 11110ae11e4627c9aab1b00ecfe5cb4451447ef7 (diff) | |
TLS: fix DISSECTOR_ASSERT for zero-length records fragments
When decrypt_ssl3_record is called with a record length of zero, it will
pass NULL to ssl_data_set because tvb_get_ptr(..., 0) yields NULL. That
triggers a DISSECTOR_ASSERT. Fix this and add expert info while at it.
Bug: 15780
Change-Id: I727b511aa48b6e1aeb20a441d1eb9d3627a74413
Reviewed-on: https://code.wireshark.org/review/33203
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-dtls.c')
| -rw-r--r-- | epan/dissectors/packet-dtls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index e7f6c117a6..c6f5184e7d 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -775,7 +775,7 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo, if (decrypted) { add_new_data_source(pinfo, decrypted, "Decrypted DTLS"); } - ssl_check_record_length(&dissect_dtls_hf, pinfo, record_length, length_pi, session->version, decrypted); + ssl_check_record_length(&dissect_dtls_hf, pinfo, (ContentType)content_type, record_length, length_pi, session->version, decrypted); switch ((ContentType) content_type) { |