aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Ontanon <luis.ontanon@gmail.com>2005-03-20 00:07:07 +0000
committerLuis Ontanon <luis.ontanon@gmail.com>2005-03-20 00:07:07 +0000
commit4012e774fdf10ceafe7d6925bba54c88edff545c (patch)
treed1663c821753659c4904e91505c6b3a432b2e277
parent6c8482f286b9d0987cc9965f8c1208c6c43b5b13 (diff)
Make sure the tap info is created even when tree==NULL
svn path=/trunk/; revision=13815
-rw-r--r--epan/dissectors/packet-http.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index cc3367bdf4..5040f445d3 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -279,7 +279,7 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo,
gboolean saw_req_resp_or_header;
guchar c;
http_type_t http_type;
- proto_item *hdr_item;
+ proto_item *hdr_item = NULL;
ReqRespDissector reqresp_dissector;
proto_tree *req_tree;
int colon_offset;
@@ -581,11 +581,12 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo,
offset, next_offset - offset, "%s",
tvb_format_text(tvb, offset,
next_offset - offset));
- if (reqresp_dissector) {
- req_tree = proto_item_add_subtree(hdr_item, ett_http_request);
- reqresp_dissector(tvb, req_tree, offset,
- line, lineend);
- }
+ }
+ if (reqresp_dissector) {
+ if (tree) req_tree = proto_item_add_subtree(hdr_item, ett_http_request);
+ else req_tree = NULL;
+
+ reqresp_dissector(tvb, req_tree, offset, line, lineend);
}
} else {
/*