osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix for bug 8826. 

The global variable 'address_item' was not always being set to NULL
before the dissection of a new frame.  Do more to set it in the general
case, and in the particular case of an MTSBindResult_PDU, which was
triggering an error in the supplied capture.

There may be other entry points where this still safely isn't being
set.

svn path=/trunk/; revision=50083
This commit is contained in:
Martin Mathieson 2013-06-20 18:54:58 +00:00
parent dc82f1cc93
commit 64e15853fc
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
asn1/p1/p1.cnf
View File

@ -1304,5 +1304,8 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
%(DEFAULT_BODY)s
p1_initialize_content_globals(NULL, FALSE);
#.FN_HDR MTSBindResult
/* TODO: there may be other entry points where this global should be initialized... */
address_item = NULL;
#.END

1
asn1/p1/packet-p1-template.c
View File

@ -123,6 +123,7 @@ void p1_initialize_content_globals (proto_tree *tree, gboolean report_unknown_co
top_tree = tree;
content_type_id = NULL;
report_unknown_content_type = report_unknown_cont_type;
address_item = NULL;
}
char* p1_get_last_oraddress (void)

11
epan/dissectors/packet-p1.c
View File

@ -3984,6 +3984,10 @@ static const ber_sequence_t MTSBindResult_set[] = {
static int
dissect_p1_MTSBindResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1308 "../../asn1/p1/p1.cnf"
/* TODO: there may be other entry points where this global should be initialized... */
address_item = NULL;
offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
MTSBindResult_set, hf_index, ett_p1_MTSBindResult);
@ -8303,6 +8307,7 @@ void p1_initialize_content_globals (proto_tree *tree, gboolean report_unknown_co
top_tree = tree;
content_type_id = NULL;
report_unknown_content_type = report_unknown_cont_type;
address_item = NULL;
}
char* p1_get_last_oraddress (void)
@ -10698,7 +10703,7 @@ void proto_register_p1(void) {
NULL, HFILL }},
/*--- End of included file: packet-p1-hfarr.c ---*/
#line 261 "../../asn1/p1/packet-p1-template.c"
#line 262 "../../asn1/p1/packet-p1-template.c"
};
/* List of subtrees */
@ -10897,7 +10902,7 @@ void proto_register_p1(void) {
&ett_p1_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeSubmissionFields,
/*--- End of included file: packet-p1-ettarr.c ---*/
#line 274 "../../asn1/p1/packet-p1-template.c"
#line 275 "../../asn1/p1/packet-p1-template.c"
};
static ei_register_info ei[] = {
@ -11100,7 +11105,7 @@ void proto_reg_handoff_p1(void) {
/*--- End of included file: packet-p1-dis-tab.c ---*/
#line 320 "../../asn1/p1/packet-p1-template.c"
#line 321 "../../asn1/p1/packet-p1-template.c"
/* APPLICATION CONTEXT */