diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-12-01 16:53:34 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-02 00:08:42 +0000 |
| commit | d2644aef369af0667220b5bd69996915b29d753d (patch) | |
| tree | c4991b5e589379949bc25600fc63c13d4e3e25ed /asn1 | |
| parent | b932ee8f136ffeb3e78ce0f03e08df81fd18d9d4 (diff) | |
[NBAP] Fix SIGSEGV in dissect_nbap_MACdPDU_Size
Bug: 11815
Change-Id: I107cf90df87bdafa23bd4b81acbc25d98773b223
Reviewed-on: https://code.wireshark.org/review/12347
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/nbap/nbap.cnf | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/asn1/nbap/nbap.cnf b/asn1/nbap/nbap.cnf index 696185380a..79f2df4099 100644 --- a/asn1/nbap/nbap.cnf +++ b/asn1/nbap/nbap.cnf @@ -1609,7 +1609,8 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items; { return offset; } - nbap_edch_channel_info[e_dch_macdflow_id].edch_ddi[num_items-1] = e_dch_ddi_value; + if(num_items>0) + nbap_edch_channel_info[e_dch_macdflow_id].edch_ddi[num_items-1] = e_dch_ddi_value; #.FN_BODY MACdPDU-Size VAL_PTR = &MACdPDU_Size %(DEFAULT_BODY)s @@ -1618,15 +1619,15 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items; { return offset; } - nbap_edch_channel_info[e_dch_macdflow_id].edch_macd_pdu_size[num_items-1] = MACdPDU_Size; + if(num_items>0) + nbap_edch_channel_info[e_dch_macdflow_id].edch_macd_pdu_size[num_items-1] = MACdPDU_Size; #.FN_BODY LogicalChannelID VAL_PTR = &logical_channel_id /* Set logical channel id for this entry*/ %(DEFAULT_BODY)s - - nbap_edch_channel_info[e_dch_macdflow_id].lchId[num_items-1] = logical_channel_id; - + if(num_items>0) + nbap_edch_channel_info[e_dch_macdflow_id].lchId[num_items-1] = logical_channel_id; #.FN_BODY RLC-Mode VAL_PTR = &rlc_mode guint32 rlc_mode; |