diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-08-26 06:40:25 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-08-26 06:40:25 +0000 |
| commit | 87d35a7c554e68cc15b3e1fdb043472c0f4be33e (patch) | |
| tree | 72ae29588aecf7bdcef455eb3f1df5b97bb64e02 | |
| parent | b73e8138a8456cdc0e3b40fb6d0ac25a47eb6602 (diff) | |
In "col_set_addr()", don't do anything other than clearing the column
expression information if the address type is AT_NONE -
"address_to_str_buf()" panics if passed an AT_NONE address, as there's
nothing sensible one can do with them. (A null string wouldn't be
appropriate here, as a dissector might have set the address columns to a
string.)
svn path=/trunk/; revision=8269
| -rw-r--r-- | epan/column-utils.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index efffe9a2e5..3b6634af2b 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -1,7 +1,7 @@ /* column-utils.c * Routines for column utilities. * - * $Id: column-utils.c,v 1.36 2003/08/26 01:30:48 guy Exp $ + * $Id: column-utils.c,v 1.37 2003/08/26 06:40:25 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -486,6 +486,8 @@ col_set_addr(packet_info *pinfo, int col, address *addr, gboolean is_res, pinfo->cinfo->col_expr[col][0] = '\0'; pinfo->cinfo->col_expr_val[col][0] = '\0'; + if (addr->type == AT_NONE) + return; /* no address, nothing to do */ if (is_res) { switch (addr->type) { |