diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-09-06 19:05:41 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-09-06 19:05:41 +0000 |
| commit | c50091ed92b461b84adb7a158bab1e43a0e18dbf (patch) | |
| tree | 5ef30a7e50d6d3c73519f200f5363b31cb7093dc /packet-kerberos.c | |
| parent | 066c4e8df9b0aeecdd2f573fca367b278b643747 (diff) | |
| download | wireshark-c50091ed92b461b84adb7a158bab1e43a0e18dbf.tar.gz wireshark-c50091ed92b461b84adb7a158bab1e43a0e18dbf.tar.bz2 wireshark-c50091ed92b461b84adb7a158bab1e43a0e18dbf.zip | |
Check that columns are enabled and that COL_INFO exists before adding
to it (in the *_OR_DIE macros).
svn path=/trunk/; revision=2390
Diffstat (limited to 'packet-kerberos.c')
| -rw-r--r-- | packet-kerberos.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/packet-kerberos.c b/packet-kerberos.c index 79de746daa..b573f2d5a6 100644 --- a/packet-kerberos.c +++ b/packet-kerberos.c @@ -3,7 +3,7 @@ * Wes Hardaker (c) 2000 * wjhardaker@ucdavis.edu * - * $Id: packet-kerberos.c,v 1.3 2000/08/13 14:08:23 deniel Exp $ + * $Id: packet-kerberos.c,v 1.4 2000/09/06 19:05:41 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -180,12 +180,14 @@ krb_proto_tree_add_time(proto_tree *tree, int offset, int str_len, start = asn1p->pointer; \ ret = asn1_header_decode (asn1p, &cls, &con, &tag, &def, &item_len); \ if (ret != ASN1_ERR_NOERROR && ret != ASN1_ERR_EMPTY) {\ - col_add_fstr(fd, COL_INFO, "ERROR: Problem at %s: %s", \ + if (check_col(fd, COL_INFO)) \ + col_add_fstr(fd, COL_INFO, "ERROR: Problem at %s: %s", \ token, to_error_str(ret)); \ return; \ } \ if (!def) {\ - col_add_fstr(fd, COL_INFO, "not definite: %s", token); \ + if (check_col(fd, COL_INFO)) \ + col_add_fstr(fd, COL_INFO, "not definite: %s", token); \ fprintf(stderr,"not definite: %s\n", token); \ return; \ } \ @@ -195,7 +197,8 @@ krb_proto_tree_add_time(proto_tree *tree, int offset, int str_len, #define KRB_DECODE_OR_DIE(token, fn, val) \ ret = fn (asn1p, &val, &length); \ if (ret != ASN1_ERR_NOERROR) { \ - col_add_fstr(fd, COL_INFO, "ERROR: Problem at %s: %s", \ + if (check_col(fd, COL_INFO)) \ + col_add_fstr(fd, COL_INFO, "ERROR: Problem at %s: %s", \ token, to_error_str(ret)); \ return; \ } \ |