diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-06-13 04:07:13 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-06-13 04:07:13 +0000 |
| commit | eecc575e23faad23e52b5747d0e85431dfc88bbc (patch) | |
| tree | bdb4908bfad83b2a854e9071cf2ceb1f07100fe9 /packet-ppp.c | |
| parent | 60f7a4d75d9d0c36f33462faf73873225b6a033a (diff) | |
| download | wireshark-eecc575e23faad23e52b5747d0e85431dfc88bbc.tar.gz wireshark-eecc575e23faad23e52b5747d0e85431dfc88bbc.tar.bz2 wireshark-eecc575e23faad23e52b5747d0e85431dfc88bbc.zip | |
"tvb_format_text()" should be able to handle a length argument of 0.
svn path=/trunk/; revision=7871
Diffstat (limited to 'packet-ppp.c')
| -rw-r--r-- | packet-ppp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/packet-ppp.c b/packet-ppp.c index 73d94f0ac8..383a047b82 100644 --- a/packet-ppp.c +++ b/packet-ppp.c @@ -2,7 +2,7 @@ * Routines for ppp packet disassembly * RFC 1661, RFC 1662 * - * $Id: packet-ppp.c,v 1.112 2003/06/12 08:33:29 guy Exp $ + * $Id: packet-ppp.c,v 1.113 2003/06/13 04:07:13 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -2119,9 +2119,7 @@ dissect_cbcp_callback_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, addr_len = tvb_strsize(tvb, offset); proto_tree_add_text(addr_tree, tvb, offset, addr_len, "Address: %s", - addr_len == 1 ? - "" : - tvb_format_text(tvb, offset, addr_len - 1)); + tvb_format_text(tvb, offset, addr_len - 1)); offset += (addr_len + 1); length -= (addr_len + 1); } |