diff options
| -rw-r--r-- | asn1/h225/packet-h225-template.c | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-h225.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c index b1d37ab51a..1894e8ba4f 100644 --- a/asn1/h225/packet-h225-template.c +++ b/asn1/h225/packet-h225-template.c @@ -453,7 +453,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre } /* add link to response frame, if available */ - if(h225ras_call->rsp_num != 0){ + if(h225ras_call && h225ras_call->rsp_num != 0){ proto_item *ti = proto_tree_add_uint_format(tree, hf_h225_ras_rsp_frame, tvb, 0, 0, h225ras_call->rsp_num, "The response to this request is in frame %u", @@ -487,6 +487,10 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre } h225ras_call = h225ras_call->next_call; } while (h225ras_call != NULL) ; + + if (!h225ras_call) { + return; + } /* if this is an ACF, ARJ or DCF, DRJ, give guid to tap and make it filterable */ if (msg_category == 3 || msg_category == 5) { diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 744e79187b..0a698bf518 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -11097,7 +11097,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre } /* add link to response frame, if available */ - if(h225ras_call->rsp_num != 0){ + if(h225ras_call && h225ras_call->rsp_num != 0){ proto_item *ti = proto_tree_add_uint_format(tree, hf_h225_ras_rsp_frame, tvb, 0, 0, h225ras_call->rsp_num, "The response to this request is in frame %u", @@ -11131,6 +11131,10 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre } h225ras_call = h225ras_call->next_call; } while (h225ras_call != NULL) ; + + if (!h225ras_call) { + return; + } /* if this is an ACF, ARJ or DCF, DRJ, give guid to tap and make it filterable */ if (msg_category == 3 || msg_category == 5) { |