summaryrefslogtreecommitdiff
path: root/epan/packet.c
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2013-08-01 21:24:54 +0000
committerJakub Zawadzki <darkjames-ws@darkjames.pl>2013-08-01 21:24:54 +0000
commitb5c43d0cf944da1f2c95bb2e9613951ae2f68e6d (patch)
tree7ed83dc6ade0e3c35dd3290ce10ccd7d2ca1c935 /epan/packet.c
parent11643ecc83922741af6a334a2a35e7e3ef45f24f (diff)
downloadwireshark-b5c43d0cf944da1f2c95bb2e9613951ae2f68e6d.tar.gz
Use opt_comment only when has_phdr_comment is set.
svn path=/trunk/; revision=51097
Diffstat (limited to 'epan/packet.c')
-rw-r--r--epan/packet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/packet.c b/epan/packet.c
index 95f98678bc..14bb35d0e6 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -361,7 +361,7 @@ dissect_packet(epan_dissect_t *edt, struct wtap_pkthdr *phdr,
/* pkt comment use first user, later from phdr */
if (fd->flags.has_user_comment)
edt->pi.pkt_comment = epan_get_user_comment(edt->session, fd);
- else
+ else if (fd->flags.has_phdr_comment)
edt->pi.pkt_comment = phdr->opt_comment;
/* to enable decode as for ethertype=0x0000 (fix for bug 4721) */