summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2005-03-21 00:54:13 +0000
committerUlf Lamping <ulf.lamping@web.de>2005-03-21 00:54:13 +0000
commit49045443e96945dbb818160b38f58f174830199b (patch)
tree5673db1559bae7dad17d1625b53dcaf4101b4aba /epan
parent18fe5b7195b79fb7d7657c1b95aae3dc61656483 (diff)
downloadwireshark-49045443e96945dbb818160b38f58f174830199b.tar.gz
bugfix (hopefully make buildbot happy again): don't call a function pointer, if it's NULL
However, handling of payload 130 and 131 at that place still seems to be bogus to me svn path=/trunk/; revision=13839
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-isakmp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index d7a005e22a..84e5d7f649 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -348,7 +348,7 @@ dissect_payloads(tvbuff_t *tvb, proto_tree *tree, guint8 initial_payload,
if (ntree == NULL)
break;
if (payload_length >= 4) { /* XXX = > 4? */
- if ((f = getpayload_func(payload)) != NULL)
+ if ((f = getpayload_func(payload)) != NULL && f->func != NULL)
(*f->func)(tvb, offset + 4, payload_length - 4, ntree, pinfo, -1);
else {
if (payload == 130)