diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-10-17 17:12:46 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-10-17 17:56:02 +0000 |
| commit | 66f27abfa01ee0e252a5a4e0ffbff2e006c4943e (patch) | |
| tree | 4b300ee5eb496b78e993a87c529282ef413725cb | |
| parent | daa562cecc397fb9491820e552d9fb6cf95b6b72 (diff) | |
| download | wireshark-66f27abfa01ee0e252a5a4e0ffbff2e006c4943e.tar.gz | |
UMTS FP: fix an out of bounds access
Bug: 11602
Change-Id: I636a5494a0eda5895e856e80424be29f01c758bf
Reviewed-on: https://code.wireshark.org/review/11117
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit 2ae329a47b7f0ac94089c23e79c6b8bc18ba80ea)
Conflicts:
epan/dissectors/packet-umts_fp.c
Reviewed-on: https://code.wireshark.org/review/11123
| -rw-r--r-- | epan/dissectors/packet-umts_fp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index c622479f79..51b8fbeb4d 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -3166,7 +3166,7 @@ dissect_hsdsch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /************************/ /*Configure the pdus*/ - for(i=0;i<number_of_pdus; i++){ + for(i=0;i<number_of_pdus && i<MIN(MAX_MAC_FRAMES, MAX_RLC_CHANS); i++){ macinf->content[i] = hsdsch_macdflow_id_mac_content_map[p_fp_info->hsdsch_macflowd_id]; /*MAC_CONTENT_PS_DTCH;*/ macinf->lchid[i] = fake_lchid_macd_flow[p_fp_info->hsdsch_macflowd_id];/*Faked logical channel id 255 used as a mark it doesnt exists...*/ macinf->fake_chid[i] = TRUE; /**/ |