git.samba.org
/
metze
/
wireshark
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bc5c484
)
isakmp: col_...() shouldn't be called under 'if (tree)'
author
Bill Meier
<wmeier@newsguy.com>
Wed, 21 Jan 2015 21:55:47 +0000
(16:55 -0500)
committer
Bill Meier
<wmeier@newsguy.com>
Wed, 21 Jan 2015 21:57:52 +0000
(21:57 +0000)
Change-Id: I6fa497ca99e2ad3b675697fd28eeafd61190a17c
Reviewed-on: https://code.wireshark.org/review/6726
Reviewed-by: Bill Meier <wmeier@newsguy.com>
epan/dissectors/packet-isakmp.c
patch
|
blob
|
history
diff --git
a/epan/dissectors/packet-isakmp.c
b/epan/dissectors/packet-isakmp.c
index 3ceeec49c653b79c67c429ca2d21637303b60e00..31a285c607757bcd9bb6dd3a557ce69ef62a1d96 100644
(file)
--- a/
epan/dissectors/packet-isakmp.c
+++ b/
epan/dissectors/packet-isakmp.c
@@
-2848,7
+2848,7
@@
dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
}
#endif /* HAVE_LIBGCRYPT */
-
if (tree)
{
+ {
proto_tree_add_item(isakmp_tree, hf_isakmp_ispi, tvb, offset, COOKIE_SIZE, ENC_NA);
offset += COOKIE_SIZE;