diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2007-03-18 13:53:07 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2007-03-18 13:53:07 +0000 |
| commit | 92ad3144dac9170bc842f510f69d90bdfc004b34 (patch) | |
| tree | 033fd93ae9446e1b48c07808bc77e6a039954575 /asn1/h248 | |
| parent | cd9c4643d4f54b4cb67e54cdf70a0cf7b73ac1c9 (diff) | |
| download | wireshark-92ad3144dac9170bc842f510f69d90bdfc004b34.tar.gz wireshark-92ad3144dac9170bc842f510f69d90bdfc004b34.tar.bz2 wireshark-92ad3144dac9170bc842f510f69d90bdfc004b34.zip | |
make sure curr_info.evt is not-NULL before derreferencing it.
fixes Bug 1451
svn path=/trunk/; revision=21048
Diffstat (limited to 'asn1/h248')
| -rw-r--r-- | asn1/h248/packet-h248-template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c index 1dcc627850..5601f373e6 100644 --- a/asn1/h248/packet-h248-template.c +++ b/asn1/h248/packet-h248-template.c @@ -1105,7 +1105,7 @@ static int dissect_h248_EventParameterName(gboolean implicit_tag _U_, tvbuff_t * curr_info.par = &no_param; - if (curr_info.evt->parameters) { + if (curr_info.evt && curr_info.evt->parameters) { for(evtpar = curr_info.evt->parameters; evtpar->hfid; evtpar++) { if (evtpar->id == param_id) { curr_info.par = evtpar; @@ -1116,7 +1116,7 @@ static int dissect_h248_EventParameterName(gboolean implicit_tag _U_, tvbuff_t * curr_info.par = &no_param; } - if (curr_info.evt->param_names && ( strval = match_strval(param_id, curr_info.evt->param_names) )) { + if (curr_info.evt && curr_info.evt->param_names && ( strval = match_strval(param_id, curr_info.evt->param_names) )) { strval = ep_strdup_printf("%s (%d)",strval,param_id); } else { strval = ep_strdup_printf("Unknown (%d)",param_id); |