diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-04-27 14:10:05 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-04-27 12:15:21 +0000 |
| commit | b588511c9ce45f63ae1a54de41f663294b8daf29 (patch) | |
| tree | 22b29ad6e00db54f43e5cead7f5ad526a8344e38 /asn1/t38 | |
| parent | 7929d9acf973439df5b7e652cc1692cc145ffa00 (diff) | |
| download | wireshark-b588511c9ce45f63ae1a54de41f663294b8daf29.tar.gz | |
T38: fix access to uninitialised variables
Bug: 10050
Change-Id: I7bc2d1b99bcb1241705a2561d9360a006fb9cb47
Reviewed-on: https://code.wireshark.org/review/1382
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'asn1/t38')
| -rw-r--r-- | asn1/t38/packet-t38-template.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index edd615ede5..40363bb83a 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -277,7 +277,8 @@ void t38_add_address(packet_info *pinfo, p_conversation_data->src_t38_info.packet_lost = 0; p_conversation_data->src_t38_info.burst_lost = 0; p_conversation_data->src_t38_info.time_first_t4_data = 0; - + p_conversation_data->src_t38_info.additional_hdlc_data_field_counter = 0; + p_conversation_data->src_t38_info.seqnum_prev_data_field = -1; p_conversation_data->dst_t38_info.reass_ID = 0; p_conversation_data->dst_t38_info.reass_start_seqnum = -1; @@ -286,6 +287,8 @@ void t38_add_address(packet_info *pinfo, p_conversation_data->dst_t38_info.packet_lost = 0; p_conversation_data->dst_t38_info.burst_lost = 0; p_conversation_data->dst_t38_info.time_first_t4_data = 0; + p_conversation_data->dst_t38_info.additional_hdlc_data_field_counter = 0; + p_conversation_data->dst_t38_info.seqnum_prev_data_field = -1; } @@ -356,7 +359,7 @@ force_reassemble_seq(reassembly_table *table, packet_info *pinfo, guint32 id) /* duplicate/retransmission/overlap */ fd_i->flags |= FD_OVERLAP; fd_head->flags |= FD_OVERLAP; - if( (last_fd->len!=fd_i->datalen) + if( (last_fd->len!=fd_i->len) || tvb_memeql(last_fd->tvb_data, 0, tvb_get_ptr(fd_i->tvb_data, 0, last_fd->len), last_fd->len) ){ fd_i->flags |= FD_OVERLAPCONFLICT; fd_head->flags |= FD_OVERLAPCONFLICT; |