diff options
| -rw-r--r-- | AUTHORS | 4 | ||||
| -rw-r--r-- | doc/ethereal.pod.template | 1 | ||||
| -rw-r--r-- | packet-beep.c | 8 |
3 files changed, 10 insertions, 3 deletions
@@ -1252,6 +1252,10 @@ Steve Housley <Steve_Housley[AT]eur.3com.com> { 802.3ad LACP support } +Peter Hawkins <peter[AT]hawkins.emu.id.au> { + Various bounds-check fixes +} + Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template index f7024263e0..765b99e33a 100644 --- a/doc/ethereal.pod.template +++ b/doc/ethereal.pod.template @@ -1448,6 +1448,7 @@ B<http://www.ethereal.com>. John Wells <wells[AT]ieee.org> Loic Tortay <tortay[AT]cc.in2p3.fr> Steve Housley <Steve_Housley[AT]eur.3com.com> + Peter Hawkins <peter[AT]hawkins.emu.id.au> Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/packet-beep.c b/packet-beep.c index 24457b4ebf..7693cb9e3b 100644 --- a/packet-beep.c +++ b/packet-beep.c @@ -1,7 +1,7 @@ /* packet-beep.c * Routines for BEEP packet disassembly * - * $Id: packet-beep.c,v 1.8 2002/04/29 09:40:05 guy Exp $ + * $Id: packet-beep.c,v 1.9 2002/06/13 07:32:32 guy Exp $ * * Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com> * Modified 2001 Darren New <dnew@invisible.net> for BEEP. @@ -470,9 +470,11 @@ dissect_beep_int(tvbuff_t *tvb, int offset, memset(int_buff, '\0', sizeof(int_buff)); - tvb_memcpy(tvb, int_buff, offset, MIN(sizeof(int_buff), i)); + tvb_memcpy(tvb, int_buff, offset, MIN(sizeof(int_buff) - 1, i)); - sscanf(int_buff, "%d", &ival); /* FIXME: Dangerous */ + /* XXX - is this still "Dangerous" now that we don't copy to the + last byte of "int_buff[]"? */ + sscanf(int_buff, "%d", &ival); if (tree) { proto_tree_add_uint(tree, hf, tvb, offset, i, ival); |