diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-10-12 14:58:02 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-10-12 14:58:02 +0000 |
| commit | 8ff757bcac0ec2d30bef79775d71c37486d30731 (patch) | |
| tree | 0c7fa7e1a79821972ef99aef0d39f74bf2f3fa66 /packet-icmpv6.c | |
| parent | faf70584f2eaa0cafb8f40a411bcbfc61264ffca (diff) | |
Don't loop infinitely on options with zero length.
From Santeri Paavolainen.
svn path=/trunk/; revision=2489
Diffstat (limited to 'packet-icmpv6.c')
| -rw-r--r-- | packet-icmpv6.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/packet-icmpv6.c b/packet-icmpv6.c index a61d243d8a..f9cf4cdd96 100644 --- a/packet-icmpv6.c +++ b/packet-icmpv6.c @@ -1,23 +1,23 @@ /* packet-icmpv6.c - * Routines for ICMPv6 packet disassembly + * Routines for ICMPv6 packet disassembly * - * $Id: packet-icmpv6.c,v 1.25 2000/08/29 14:17:12 itojun Exp $ + * $Id: packet-icmpv6.c,v 1.26 2000/10/12 14:58:02 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> * Copyright 1998 Gerald Combs * - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -208,6 +208,14 @@ again: } } + if (opt->nd_opt_len == 0) { + proto_tree_add_text(icmp6opt_tree, NullTVB, + offset + offsetof(struct nd_opt_hdr, nd_opt_len), 1, + "Invalid option length: %d", + opt->nd_opt_len); + return; + } + offset += (opt->nd_opt_len << 3); goto again; } @@ -1019,4 +1027,3 @@ proto_reg_handoff_icmpv6(void) { old_dissector_add("ip.proto", IP_PROTO_ICMPV6, dissect_icmpv6); } - |