diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 1999-09-09 04:47:17 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 1999-09-09 04:47:17 +0000 |
| commit | ca61d69c63d7637e42920530803e82bbe93b8bb4 (patch) | |
| tree | 9312a6c591b25dfed03887ff75b3df8f3b3ff5a1 /packet-trmac.c | |
| parent | d32b5f829fac401b28f4810a3aa4350d9577efdb (diff) | |
Removed two cases where protocol decoding assumed that the data in the
packets were correct. Bad packets could cause segfaults.
svn path=/trunk/; revision=641
Diffstat (limited to 'packet-trmac.c')
| -rw-r--r-- | packet-trmac.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/packet-trmac.c b/packet-trmac.c index 67d6f04d5d..e219422c38 100644 --- a/packet-trmac.c +++ b/packet-trmac.c @@ -2,7 +2,7 @@ * Routines for Token-Ring Media Access Control * Gilbert Ramirez <gram@verdict.uthscsa.edu> * - * $Id: packet-trmac.c,v 1.13 1999/07/29 05:47:06 gram Exp $ + * $Id: packet-trmac.c,v 1.14 1999/09/09 04:47:17 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -72,6 +72,7 @@ static int sv_text(const u_char *pd, int pkt_offset, proto_tree *tree) { int sv_length = pd[0]; + guint16 beacon_type; char *beacon[] = {"Recovery mode set", "Signal loss error", "Streaming signal not Claim Token MAC frame", @@ -88,8 +89,14 @@ sv_text(const u_char *pd, int pkt_offset, proto_tree *tree) switch(pd[1]) { case 0x01: /* Beacon Type */ - proto_tree_add_text(tree, pkt_offset+1, sv_length-1, - "Beacon Type: %s", beacon[ pntohs( &pd[2] ) ] ); + beacon_type = pntohs(&pd[2]); + if (beacon_type < array_length(beacon)) { + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, + "Beacon Type: %s", beacon[beacon_type] ); + } else { + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, + "Beacon Type: Illegal value: %d", beacon_type ); + } break; case 0x02: /* NAUN */ |