diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-24 14:07:10 -0400 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-06-24 19:26:17 +0000 |
| commit | 65b75212e183039eb1d8996edde1cee9b2f60d88 (patch) | |
| tree | 2f26a07b0b82d3a68acd3a346555279f7cfa0516 | |
| parent | eaf6bf3ec0be168625e59856ac67c6b68f2a93c3 (diff) | |
Ensure proto_item from subtree is initialized
bug:10223
Change-Id: I40ed92bcf436723ad3927a93181f7c732cf4690f
Reviewed-on: https://code.wireshark.org/review/2623
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
| -rw-r--r-- | epan/proto.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/proto.c b/epan/proto.c index 08bbf01168..cabc70b155 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -1142,6 +1142,10 @@ proto_tree_add_subtree_format(proto_tree *tree, tvbuff_t *tvb, gint start, gint va_list ap; header_field_info *hfinfo; + /* Make sure pi is initialized in case TRY_TO_FAKE_THIS_ITEM bails */ + if (tree_item != NULL) + *tree_item = NULL; + TRY_TO_FAKE_THIS_ITEM(tree, hf_text_only, hfinfo); pi = proto_tree_add_text_node(tree, tvb, start, length); |