diff options
| author | Lars Roland <Lars.Roland@gmx.net> | 2006-01-29 15:54:10 +0000 |
|---|---|---|
| committer | Lars Roland <Lars.Roland@gmx.net> | 2006-01-29 15:54:10 +0000 |
| commit | de4522f70dab6661010ed835d132ffdf956e911b (patch) | |
| tree | c2e481afdfb3bd5a021a3792c7510ba7b2669233 | |
| parent | e01909c0ea0ac114d898959b196066c02337e811 (diff) | |
Fix an infinite loop in gsm_a dissector and a wrong offset in uma dissector.
This fixes bug 716.
svn path=/trunk/; revision=17119
| -rw-r--r-- | epan/dissectors/packet-gsm_a.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-uma.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-gsm_a.c b/epan/dissectors/packet-gsm_a.c index 2184afb7b2..04bfeff343 100644 --- a/epan/dissectors/packet-gsm_a.c +++ b/epan/dissectors/packet-gsm_a.c @@ -2384,10 +2384,10 @@ be_cell_id_aux(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar break; default: - proto_tree_add_text(tree, tvb, curr_offset, len - 1, + proto_tree_add_text(tree, tvb, curr_offset, len, "Cell ID - Unknown format"); - curr_offset += (len - 1); + curr_offset += (len); break; } diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index eaffc1f8ff..8260a62f31 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -1035,7 +1035,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) /* Cell Identifier List * The rest of the IE is coded as in [TS 48.008], not including IEI and length, if present */ - be_cell_id_list(tvb, urr_ie_tree, offset, ie_len, NULL, 0); + be_cell_id_list(tvb, urr_ie_tree, ie_offset, ie_len, NULL, 0); break; case 16: /* TU3907 Timer */ proto_tree_add_item(urr_ie_tree, hf_uma_urr_TU3907_timer, tvb, ie_offset, 2, FALSE); |