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

Don't intentionally use -1 as an hfindex: while only naughty before, with the 

changes from r49644 you'll get complaints about the hf being unregistered...

Note that this code also intentionally passes -1 as an ett_index.  It doesn't
currently complain so I'm leaving it alone for now...

svn path=/trunk/; revision=49648
This commit is contained in:
Jeff Morriss 2013-05-31 02:27:40 +00:00
parent eb8217a371
commit 813dcf79a1
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asn1/t124/packet-t124-template.c
View File

@ -163,9 +163,11 @@ dissect_t124_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, vo
* to have a version of dissect_per_sequence() that checks all
* references to the tvbuff before making them and returning "no"
* if they would fail.
*
* We (ab)use hf_t124_connectGCCPDU here just to give a valid entry...
*/
TRY {
(void) dissect_per_sequence(tvb, 0, &asn1_ctx, NULL, -1, -1, t124Heur_sequence);
(void) dissect_per_sequence(tvb, 0, &asn1_ctx, NULL, hf_t124_connectGCCPDU, -1, t124Heur_sequence);
} CATCH_BOUNDS_ERRORS {
failed = TRUE;
} ENDTRY;

8
epan/dissectors/packet-t124.c
View File

@ -2973,9 +2973,11 @@ dissect_t124_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, vo
* to have a version of dissect_per_sequence() that checks all
* references to the tvbuff before making them and returning "no"
* if they would fail.
*
* We (ab)use hf_t124_connectGCCPDU here just to give a valid entry...
*/
TRY {
(void) dissect_per_sequence(tvb, 0, &asn1_ctx, NULL, -1, -1, t124Heur_sequence);
(void) dissect_per_sequence(tvb, 0, &asn1_ctx, NULL, hf_t124_connectGCCPDU, -1, t124Heur_sequence);
} CATCH_BOUNDS_ERRORS {
failed = TRUE;
} ENDTRY;
@ -3900,7 +3902,7 @@ void proto_register_t124(void) {
NULL, HFILL }},
/*--- End of included file: packet-t124-hfarr.c ---*/
#line 201 "../../asn1/t124/packet-t124-template.c"
#line 203 "../../asn1/t124/packet-t124-template.c"
};
/* List of subtrees */
@ -4013,7 +4015,7 @@ void proto_register_t124(void) {
&ett_t124_DomainMCSPDU,
/*--- End of included file: packet-t124-ettarr.c ---*/
#line 208 "../../asn1/t124/packet-t124-template.c"
#line 210 "../../asn1/t124/packet-t124-template.c"
};
/* Register protocol */