aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-05 00:36:27 +0000
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-05 00:36:27 +0000
commit9b210b8b0c54873e50ae201b73b5961d2fd0bd8b (patch)
treed2ff2a14c3e2d594adf43ed9c06f01736fec0b81 /asn1
parent6667616bfa37907bbe0d819b30b76fd4c58afe97 (diff)
Add a couple of pointer checks.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29301 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
-rw-r--r--asn1/h225/packet-h225-template.c6
1 files changed, 5 insertions, 1 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) {